Use ENTRY and END in more MIPS .S files.

diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index b04001e..cde1f70 100644 (file)
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,5 +1,20 @@
 2013-02-08  Joseph Myers  <joseph@codesourcery.com>
 
+       * sysdeps/mips/add_n.S (__mpn_add_n): Use END.
+       * sysdeps/mips/bsd-_setjmp.S (_setjmp): Likewise.
+       * sysdeps/mips/bsd-setjmp.S (setjmp): Likewise.
+       * sysdeps/mips/mips64/add_n.S (__mpn_add_n): Use ENTRY and END.
+       * sysdeps/mips/mips64/addmul_1.S (__mpn_addmul_1): Likewise.
+       * sysdeps/mips/mips64/bsd-_setjmp.S (_setjmp): Use END.
+       * sysdeps/mips/mips64/bsd-setjmp.S (setjmp): Likewise.
+       * sysdeps/mips/mips64/lshift.S (__mpn_lshift): Use ENTRY and END.
+       * sysdeps/mips/mips64/mul_1.S (__mpn_mul_1): Likewise.
+       * sysdeps/mips/mips64/rshift.S (__mpn_rshift): Likewise.
+       * sysdeps/mips/mips64/setjmp.S (__sigsetjmp): Use END.
+       * sysdeps/mips/mips64/sub_n.S (__mpn_sub_n): Use ENTRY and END.
+       * sysdeps/mips/mips64/submul_1.S (__mpn_submul_1): Likewise.
+       * sysdeps/mips/setjmp.S (__sigsetjmp): Use END.
+
        [BZ #13550]
        * sysdeps/unix/sysv/linux/mips/mips64/msgctl.c: Do not include
        <bp-checks.h>.

diff --git a/ports/sysdeps/mips/add_n.S b/ports/sysdeps/mips/add_n.S
index 7a3848f..e83fc81 100644 (file)
--- a/ports/sysdeps/mips/add_n.S
+++ b/ports/sysdeps/mips/add_n.S
@@ -118,4 +118,4 @@ L(end):     addu    $11,$11,$2
        sw      $11,0($4)
        j       $31
        or      $2,$2,$8
-       .end __mpn_add_n
+END (__mpn_add_n)

diff --git a/ports/sysdeps/mips/bsd-_setjmp.S b/ports/sysdeps/mips/bsd-_setjmp.S
index a932096..1974e4b 100644 (file)
--- a/ports/sysdeps/mips/bsd-_setjmp.S
+++ b/ports/sysdeps/mips/bsd-_setjmp.S
@@ -38,5 +38,5 @@ ENTRY (_setjmp)
 #else
        j       C_SYMBOL_NAME (__sigsetjmp)
 #endif
-       .end    _setjmp
+END (_setjmp)
 libc_hidden_def (_setjmp)

diff --git a/ports/sysdeps/mips/bsd-setjmp.S b/ports/sysdeps/mips/bsd-setjmp.S
index 406c849..5eedcdd 100644 (file)
--- a/ports/sysdeps/mips/bsd-setjmp.S
+++ b/ports/sysdeps/mips/bsd-setjmp.S
@@ -38,4 +38,4 @@ ENTRY (setjmp)
 #else
        j       C_SYMBOL_NAME (__sigsetjmp)
 #endif
-       .end    setjmp
+END (setjmp)

diff --git a/ports/sysdeps/mips/mips64/add_n.S b/ports/sysdeps/mips/mips64/add_n.S
index efb6cf4..020d4af 100644 (file)
--- a/ports/sysdeps/mips/mips64/add_n.S
+++ b/ports/sysdeps/mips/mips64/add_n.S
@@ -33,11 +33,7 @@
 #ifdef __PIC__
        .option pic2
 #endif
-       .text
-       .align  2
-       .globl  __mpn_add_n
-       .ent    __mpn_add_n
-__mpn_add_n:
+ENTRY (__mpn_add_n)
 #ifdef __PIC__
        SETUP_GP /* ??? unused */
 #endif
@@ -126,4 +122,4 @@ L(Lend):    daddu   $11,$11,$2
        j       $31
        or      $2,$2,$8
 
-       .end    __mpn_add_n
+END (__mpn_add_n)

diff --git a/ports/sysdeps/mips/mips64/addmul_1.S b/ports/sysdeps/mips/mips64/addmul_1.S
index 43838fd..46729a6 100644 (file)
--- a/ports/sysdeps/mips/mips64/addmul_1.S
+++ b/ports/sysdeps/mips/mips64/addmul_1.S
@@ -32,11 +32,7 @@
 #ifdef PIC
        .option pic2
 #endif
-       .text
-       .align  4
-       .globl  __mpn_addmul_1
-       .ent    __mpn_addmul_1
-__mpn_addmul_1:
+ENTRY (__mpn_addmul_1)
 #ifdef PIC
        SETUP_GP /* ??? unused */
 #endif
@@ -102,4 +98,4 @@ L(LC0):      ld      $10,0($4)
        j       $31
        daddu   $2,$9,$2        # add high product limb and carry from addition
 
-       .end    __mpn_addmul_1
+END (__mpn_addmul_1)

diff --git a/ports/sysdeps/mips/mips64/bsd-_setjmp.S b/ports/sysdeps/mips/mips64/bsd-_setjmp.S
index de36cf0..83b1264 100644 (file)
--- a/ports/sysdeps/mips/mips64/bsd-_setjmp.S
+++ b/ports/sysdeps/mips/mips64/bsd-_setjmp.S
@@ -43,5 +43,5 @@ ENTRY (_setjmp)
 #else
        j       C_SYMBOL_NAME (__sigsetjmp)
 #endif
-       .end    _setjmp
+END (_setjmp)
 libc_hidden_def (_setjmp)

diff --git a/ports/sysdeps/mips/mips64/bsd-setjmp.S b/ports/sysdeps/mips/mips64/bsd-setjmp.S
index c3e26bf..15af26a 100644 (file)
--- a/ports/sysdeps/mips/mips64/bsd-setjmp.S
+++ b/ports/sysdeps/mips/mips64/bsd-setjmp.S
@@ -43,4 +43,4 @@ ENTRY (setjmp)
 #else
        j       C_SYMBOL_NAME (__sigsetjmp)
 #endif
-       .end    setjmp
+END (setjmp)

diff --git a/ports/sysdeps/mips/mips64/lshift.S b/ports/sysdeps/mips/mips64/lshift.S
index e0b02bc..740408d 100644 (file)
--- a/ports/sysdeps/mips/mips64/lshift.S
+++ b/ports/sysdeps/mips/mips64/lshift.S
@@ -32,11 +32,7 @@
 #ifdef __PIC__
        .option pic2
 #endif
-       .text
-       .align  2
-       .globl  __mpn_lshift
-       .ent    __mpn_lshift
-__mpn_lshift:
+ENTRY (__mpn_lshift)
 #ifdef __PIC__
        SETUP_GP /* ??? unused */
 #endif
@@ -101,4 +97,4 @@ L(Loop):     ld      $3,-16($5)
 L(Lend):       dsll    $8,$10,$7
        j       $31
        sd      $8,-8($4)
-       .end    __mpn_lshift
+END (__mpn_lshift)

diff --git a/ports/sysdeps/mips/mips64/mul_1.S b/ports/sysdeps/mips/mips64/mul_1.S
index 2fe28d3..e136065 100644 (file)
--- a/ports/sysdeps/mips/mips64/mul_1.S
+++ b/ports/sysdeps/mips/mips64/mul_1.S
@@ -33,11 +33,7 @@
 #ifdef __PIC__
        .option pic2
 #endif
-       .text
-       .align  4
-       .globl  __mpn_mul_1
-       .ent    __mpn_mul_1
-__mpn_mul_1:
+ENTRY (__mpn_mul_1)
 #ifdef __PIC__
        SETUP_GP /* ??? unused */
 #endif
@@ -91,4 +87,4 @@ L(LC0):       mflo    $10
        j       $31
        daddu   $2,$9,$2        # add high product limb and carry from addition
 
-       .end    __mpn_mul_1
+END (__mpn_mul_1)

diff --git a/ports/sysdeps/mips/mips64/rshift.S b/ports/sysdeps/mips/mips64/rshift.S
index 75ac68b..0d821f2 100644 (file)
--- a/ports/sysdeps/mips/mips64/rshift.S
+++ b/ports/sysdeps/mips/mips64/rshift.S
@@ -32,11 +32,7 @@
 #ifdef __PIC__
        .option pic2
 #endif
-       .text
-       .align  2
-       .globl  __mpn_rshift
-       .ent    __mpn_rshift
-__mpn_rshift:
+ENTRY (__mpn_rshift)
 #ifdef __PIC__
        SETUP_GP /* ??? unused */
 #endif
@@ -98,4 +94,4 @@ L(Loop):      ld      $3,8($5)
 L(Lend):       dsrl    $8,$10,$7
        j       $31
        sd      $8,0($4)
-       .end    __mpn_rshift
+END (__mpn_rshift)

diff --git a/ports/sysdeps/mips/mips64/setjmp.S b/ports/sysdeps/mips/mips64/setjmp.S
index 53ed92c..621e390 100644 (file)
--- a/ports/sysdeps/mips/mips64/setjmp.S
+++ b/ports/sysdeps/mips/mips64/setjmp.S
@@ -41,4 +41,4 @@ ENTRY (__sigsetjmp)
        move a4, gp
 #endif
        jr t9
-       .end __sigsetjmp
+END (__sigsetjmp)

diff --git a/ports/sysdeps/mips/mips64/sub_n.S b/ports/sysdeps/mips/mips64/sub_n.S
index ea8f4bd..dd6f691 100644 (file)
--- a/ports/sysdeps/mips/mips64/sub_n.S
+++ b/ports/sysdeps/mips/mips64/sub_n.S
@@ -33,11 +33,7 @@
 #ifdef __PIC__
        .option pic2
 #endif
-       .text
-       .align  2
-       .globl  __mpn_sub_n
-       .ent    __mpn_sub_n
-__mpn_sub_n:
+ENTRY (__mpn_sub_n)
 #ifdef __PIC__
        SETUP_GP /* ??? unused */
 #endif
@@ -126,4 +122,4 @@ L(Lend):    daddu   $11,$11,$2
        j       $31
        or      $2,$2,$8
 
-       .end    __mpn_sub_n
+END (__mpn_sub_n)

diff --git a/ports/sysdeps/mips/mips64/submul_1.S b/ports/sysdeps/mips/mips64/submul_1.S
index 22239d5..bf5d6ff 100644 (file)
--- a/ports/sysdeps/mips/mips64/submul_1.S
+++ b/ports/sysdeps/mips/mips64/submul_1.S
@@ -33,11 +33,7 @@
 #ifdef __PIC__
        .option pic2
 #endif
-       .text
-       .align  4
-       .globl  __mpn_submul_1
-       .ent    __mpn_submul_1
-__mpn_submul_1:
+ENTRY (__mpn_submul_1)
 #ifdef __PIC__
        SETUP_GP /* ??? unused */
 #endif
@@ -103,4 +99,4 @@ L(LC0):      ld      $10,0($4)
        j       $31
        daddu   $2,$9,$2        # add high product limb and carry from addition
 
-       .end    __mpn_submul_1
+END (__mpn_submul_1)

diff --git a/ports/sysdeps/mips/setjmp.S b/ports/sysdeps/mips/setjmp.S
index 7c53b97..3f923fb 100644 (file)
--- a/ports/sysdeps/mips/setjmp.S
+++ b/ports/sysdeps/mips/setjmp.S
@@ -41,4 +41,4 @@ ENTRY (__sigsetjmp)
 #else
        j       __sigsetjmp_aux
 #endif
-       .end __sigsetjmp
+END (__sigsetjmp)