3 files changed, 4 insertions, 4 deletions
diff --git a/gcc/config/score/score.h b/gcc/config/score/score.h
index 8a1efb6f4f5..ffb5af891ee 100644
--- a/gcc/config/score/score.h
+++ b/gcc/config/score/score.h
@@ -508,7 +508,7 @@ extern enum reg_class score_char_to_class[256];
 
 /* The offset of the first local variable from the beginning of the frame.
    See compute_frame_size for details about the frame layout.  */
-#define STARTING_FRAME_OFFSET           current_function_outgoing_args_size
+#define STARTING_FRAME_OFFSET           crtl->outgoing_args_size
 
 /* The argument pointer always points to the first argument.  */
 #define FIRST_PARM_OFFSET(FUNDECL)      0
@@ -578,7 +578,7 @@ extern enum reg_class score_char_to_class[256];
    allocate the area reserved for arguments passed in registers.
    If `ACCUMULATE_OUTGOING_ARGS' is also defined, the only effect
    of this macro is to determine whether the space is included in
-   `current_function_outgoing_args_size'.  */
+   `crtl->outgoing_args_size'.  */
 #define OUTGOING_REG_PARM_STACK_SPACE   1
 
 #define RETURN_POPS_ARGS(FUNDECL, FUNTYPE, STACK_SIZE) 0
diff --git a/gcc/config/score/score3.c b/gcc/config/score/score3.c
index 592f5f5a1f7..1399bee15cb 100644
--- a/gcc/config/score/score3.c
+++ b/gcc/config/score/score3.c
@@ -183,7 +183,7 @@ score3_compute_frame_size (HOST_WIDE_INT size)
   f->gp_reg_size = 0;
   f->mask = 0;
   f->var_size = SCORE3_STACK_ALIGN (size);
-  f->args_size = current_function_outgoing_args_size;
+  f->args_size = crtl->outgoing_args_size;
   f->cprestore_size = flag_pic ? UNITS_PER_WORD : 0;
 
   if (f->var_size == 0 && current_function_is_leaf)
diff --git a/gcc/config/score/score7.c b/gcc/config/score/score7.c
index 3c16b0d6173..2796e2e0d24 100644
--- a/gcc/config/score/score7.c
+++ b/gcc/config/score/score7.c
@@ -183,7 +183,7 @@ score7_compute_frame_size (HOST_WIDE_INT size)
   f->gp_reg_size = 0;
   f->mask = 0;
   f->var_size = SCORE7_STACK_ALIGN (size);
-  f->args_size = current_function_outgoing_args_size;
+  f->args_size = crtl->outgoing_args_size;
   f->cprestore_size = flag_pic ? UNITS_PER_WORD : 0;
   if (f->var_size == 0 && current_function_is_leaf)
     f->args_size = f->cprestore_size = 0;