* config/frv/frv.c (frv_stack_info): Use crtl instead of cfun.

  (frv_expand_builtin_va_start): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134554 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb996fc..7c659d4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-22  Nick Clifton  <nickc@redhat.com>
 
+       * config/frv/frv.c (frv_stack_info): Use crtl instead of cfun.
+       (frv_expand_builtin_va_start): Likewise.
+
        * config/arm/arm.c (thumb_find_work_register): Fix location of
        argument register count.
 

diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 150e25d..badc45e 100644 (file)
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -1208,7 +1208,7 @@ frv_stack_info (void)
              /* If this is a stdarg function with a non varardic
                 argument split between registers and the stack,
                 adjust the saved registers downward.  */
-             last -= (ADDR_ALIGN (cfun->pretend_args_size, UNITS_PER_WORD)
+             last -= (ADDR_ALIGN (crtl->args.pretend_args_size, UNITS_PER_WORD)
                       / UNITS_PER_WORD);
 
              for (regno = first; regno <= last; regno++)
@@ -1268,13 +1268,13 @@ frv_stack_info (void)
      be used, or the size of a word otherwise.  */
   alignment = (TARGET_DWORD? 2 * UNITS_PER_WORD : UNITS_PER_WORD);
 
-  info_ptr->parameter_size = ADDR_ALIGN (cfun->outgoing_args_size, alignment);
+  info_ptr->parameter_size = ADDR_ALIGN (crtl->outgoing_args_size, alignment);
   info_ptr->regs_size = ADDR_ALIGN (info_ptr->regs_size_2words
                                    + info_ptr->regs_size_1word,
                                    alignment);
   info_ptr->vars_size = ADDR_ALIGN (get_frame_size (), alignment);
 
-  info_ptr->pretend_size = cfun->pretend_args_size;
+  info_ptr->pretend_size = crtl->args.pretend_args_size;
 
   /* Work out the size of the frame, excluding the header.  Both the frame
      body and register parameter area will be dword-aligned.  */
@@ -2194,7 +2194,7 @@ static void
 frv_expand_builtin_va_start (tree valist, rtx nextarg)
 {
   tree t;
-  int num = cfun->args_info - FIRST_ARG_REGNUM - FRV_NUM_ARG_REGS;
+  int num = crtl->args.info - FIRST_ARG_REGNUM - FRV_NUM_ARG_REGS;
 
   nextarg = gen_rtx_PLUS (Pmode, virtual_incoming_args_rtx,
                          GEN_INT (UNITS_PER_WORD * num));
@@ -2202,7 +2202,7 @@ frv_expand_builtin_va_start (tree valist, rtx nextarg)
   if (TARGET_DEBUG_ARG)
     {
       fprintf (stderr, "va_start: args_info = %d, num = %d\n",
-              cfun->args_info, num);
+              crtl->args.info, num);
 
       debug_rtx (nextarg);
     }