From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21968 invoked by alias); 8 Feb 2013 02:05:12 -0000 Received: (qmail 21910 invoked by uid 22791); 8 Feb 2013 02:05:11 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_50,KAM_STOCKGEN,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_SR,TW_TJ X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 08 Feb 2013 02:05:05 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1U3dKp-0003sI-Ha from joseph_myers@mentor.com for libc-ports@sourceware.org; Thu, 07 Feb 2013 18:05:03 -0800 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 7 Feb 2013 18:05:03 -0800 Received: from digraph.polyomino.org.uk (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Fri, 8 Feb 2013 02:05:00 +0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1U3dKl-0006Az-Oh for libc-ports@sourceware.org; Fri, 08 Feb 2013 02:04:59 +0000 Date: Fri, 08 Feb 2013 02:05:00 -0000 From: "Joseph S. Myers" To: Subject: Use ENTRY and END in more MIPS .S files Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2013-02/txt/msg00014.txt.bz2 I've committed this patch, extracted from the CFI changes, to use ENTRY and END more consistently in MIPS glibc .S files. (In conjunction with the CFI changes this means those files get cfi_startproc / cfi_endproc from the expansions of the ENTRY and END macros; until those are in, it's simply a cleanup that doesn't depend on the CFI changes.) 2013-02-08 Joseph Myers * 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. diff --git a/ports/sysdeps/mips/add_n.S b/ports/sysdeps/mips/add_n.S index 7a3848f..e83fc81 100644 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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) -- Joseph S. Myers joseph@codesourcery.com