mips.c (mips_arg_info): If MUST_PASS_IN_STACK, skip any remaining register arguments.

	* config/mips/mips.c (mips_arg_info): If MUST_PASS_IN_STACK,
	skip any remaining register arguments.

From-SVN: r72156

2 files changed, 20 insertions, 8 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b39d79c..5e01a06 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-06  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/mips.c (mips_arg_info): If MUST_PASS_IN_STACK,
+	skip any remaining register arguments.
+
 2003-10-06  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* reload.c (find_reloads_subreg_address): Use correct offset for
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 0d2f931..bcd9586 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -3644,15 +3644,22 @@ mips_arg_info (const CUMULATIVE_ARGS *cum, enum machine_mode mode,
 	even_reg_p = true;
     }
 
-  /* Set REG_OFFSET to the register count we're interested in.
-     The EABI allocates the floating-point registers separately,
-     but the other ABIs allocate them like integer registers.  */
-  info->reg_offset = (mips_abi == ABI_EABI && info->fpr_p
-		      ? cum->num_fprs
-		      : cum->num_gprs);
+  if (mips_abi != ABI_EABI && MUST_PASS_IN_STACK (mode, type))
+    /* This argument must be passed on the stack.  Eat up all the
+       remaining registers.  */
+    info->reg_offset = MAX_ARGS_IN_REGISTERS;
+  else
+    {
+      /* Set REG_OFFSET to the register count we're interested in.
+	 The EABI allocates the floating-point registers separately,
+	 but the other ABIs allocate them like integer registers.  */
+      info->reg_offset = (mips_abi == ABI_EABI && info->fpr_p
+			  ? cum->num_fprs
+			  : cum->num_gprs);
 
-  if (even_reg_p)
-    info->reg_offset += info->reg_offset & 1;
+      if (even_reg_p)
+	info->reg_offset += info->reg_offset & 1;
+    }
 
   /* The alignment applied to registers is also applied to stack arguments.  */
   info->stack_offset = cum->stack_words;