* sysdeps/mips/bsd-_setjmp.S (_setjmp): Reorder instructions to

	avoid problems on MIPS I.
	* sysdeps/mips/bsd-setjmp.S (setjmp): Likewise.

	* sysdeps/mips/dl-machine.h (RTLD_START): Remove duplicate ".set
	noreorder".

diff --git a/sysdeps/mips/bsd-_setjmp.S b/sysdeps/mips/bsd-_setjmp.S
index bf7cb15..919c8a2 100644 (file)
--- a/sysdeps/mips/bsd-_setjmp.S
+++ b/sysdeps/mips/bsd-_setjmp.S
@@ -27,14 +27,16 @@
        .option pic2
 #endif
 ENTRY (_setjmp)
-       .set noreorder
 #ifdef __PIC__
+       .set    noreorder
        .cpload t9
+       .set    reorder
        la      t9, C_SYMBOL_NAME (__sigsetjmp)
+#endif
+       move    a1,zero         /* Pass a second argument of zero.  */
+#ifdef __PIC__
        jr      t9
 #else
        j       C_SYMBOL_NAME (__sigsetjmp)
 #endif
-       move    a1,zero         /* Pass a second argument of zero.  */
-       .set    reorder
        .end    _setjmp

diff --git a/sysdeps/mips/bsd-setjmp.S b/sysdeps/mips/bsd-setjmp.S
index bab312b..66a0daa 100644 (file)
--- a/sysdeps/mips/bsd-setjmp.S
+++ b/sysdeps/mips/bsd-setjmp.S
@@ -30,11 +30,13 @@ ENTRY (setjmp)
        .set    noreorder
 #ifdef __PIC__
        .cpload t9
+       .set    reorder
        la      t9, C_SYMBOL_NAME (__sigsetjmp)
+#endif
+       li      a1, 1           /* Pass a second argument of one.  */
+#ifdef __PIC__
        jr      t9
 #else
        j       C_SYMBOL_NAME (__sigsetjmp)
 #endif
-       li      a1, 1           /* Pass a second argument of one.  */
-       .set    reorder
        .end    setjmp

diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index cd8ee3c..6a7d66c 100644 (file)
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -412,7 +412,6 @@ _dl_runtime_resolve:\n                                                            \
        ".text\n"\
        _RTLD_PROLOGUE(ENTRY_POINT)\
        ".set noreorder\n\
-       .set noreorder\n\
        bltzal $0, 0f\n\
        nop\n\
 0:     .cpload $31\n\