crtn.asm: Don't use __mips16 to determine the return-address offset.

	* config/mips/crtn.asm: Don't use __mips16 to determine the
	return-address offset.  Define RA to a suitable temporary
	register for the return address.

From-SVN: r55903

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46eb1dacd9e4e12f5aad4f939aebc20656d63e84..ff553ab4207c7fc5a0a51a84c6e2bf298770d3c1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-31  Richard Sandiford  <rsandifo@redhat.com>
+
+       * config/mips/crtn.asm: Don't use __mips16 to determine the
+       return-address offset.  Define RA to a suitable temporary
+       register for the return address.
+
 2002-07-31  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/mips/mips.md (eh_set_lr_si, eh_set_lr_di): Change

diff --git a/gcc/config/mips/crtn.asm b/gcc/config/mips/crtn.asm
index 54ab2a5099d45b90093ea996cf2f304747edaeab..5d41d3d7ecb84f409640915b5a9305e278b55f4f 100644 (file)
--- a/gcc/config/mips/crtn.asm
+++ b/gcc/config/mips/crtn.asm
@@ -1,39 +1,29 @@
 /* 4 slots for argument spill area.  1 for cpreturn, 1 for stack.
    Return spill offset of 40 and 20.  Aligned to 16 bytes for n32.  */
 
-       .section .init,"ax",@progbits
 #ifdef __mips16
-/* The mips16 uses $7 for a return address. We use that here too.  */
-       lw      $7,20($sp)
-       addu    $sp,$sp,32
-
-       j       $7
+#define RA $7
 #else
+#define RA $31
+#endif
+
+       .section .init,"ax",@progbits
 #ifdef __mips64
-       ld      $31,40($sp)
+       ld      RA,40($sp)
        daddu   $sp,$sp,48
 #else
-       lw      $31,20($sp)
+       lw      RA,20($sp)
        addu    $sp,$sp,32
 #endif
-       j       $31
-
-#endif
+       j       RA
 
        .section .fini,"ax",@progbits
-#ifdef __mips16
-/* The mips16 uses $7 for a return address. We use that here too.  */
-       lw      $7,20($sp)
-       addu    $sp,$sp,32
-
-       j       $7
-#else
 #ifdef __mips64
-       ld      $31,40($sp)
+       ld      RA,40($sp)
        daddu   $sp,$sp,48
 #else
-       lw      $31,20($sp)
+       lw      RA,20($sp)
        addu    $sp,$sp,32
 #endif
-       j       $31
-#endif
+       j       RA
+