From af0172162f7c653cad6a11ed1c1a5459bc154465 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 14 Jan 2006 00:58:03 +0000 Subject: hidden_def/hidden_proto: convert all users (I hope) termios split, add some missing headers, other jump relocs removed --- libc/string/sparc/_glibc_inc.h | 1 - libc/string/sparc/sparc32/memchr.S | 8 ++++---- libc/string/sparc/sparc32/memcpy.S | 18 +++++++++--------- libc/string/sparc/sparc32/memset.S | 12 ++++++------ libc/string/sparc/sparc32/stpcpy.S | 6 +++--- libc/string/sparc/sparc32/strcat.S | 6 +++--- libc/string/sparc/sparc32/strchr.S | 16 ++++++++-------- libc/string/sparc/sparc32/strcmp.S | 7 +++---- libc/string/sparc/sparc32/strcpy.S | 7 +++---- libc/string/sparc/sparc32/strlen.S | 7 +++---- libc/string/sparc/sparc64/memchr.S | 8 ++++---- libc/string/sparc/sparc64/memcpy.S | 22 +++++++++++----------- libc/string/sparc/sparc64/memset.S | 12 ++++++------ libc/string/sparc/sparc64/sparcv9b/memcpy.S | 18 +++++++++--------- libc/string/sparc/sparc64/stpcpy.S | 7 +++---- libc/string/sparc/sparc64/strcat.S | 7 +++---- libc/string/sparc/sparc64/strchr.S | 16 ++++++++-------- libc/string/sparc/sparc64/strcmp.S | 7 +++---- libc/string/sparc/sparc64/strcpy.S | 6 +++--- libc/string/sparc/sparc64/strlen.S | 7 +++---- 20 files changed, 95 insertions(+), 103 deletions(-) (limited to 'libc/string/sparc') diff --git a/libc/string/sparc/_glibc_inc.h b/libc/string/sparc/_glibc_inc.h index 6ef1dbde6..4eb4d755c 100644 --- a/libc/string/sparc/_glibc_inc.h +++ b/libc/string/sparc/_glibc_inc.h @@ -14,7 +14,6 @@ #define ENTRY(sym) \ .global sym; \ - .hidden sym; \ .align ENTRY_ALIGN; \ .type sym,%function; \ sym: diff --git a/libc/string/sparc/sparc32/memchr.S b/libc/string/sparc/sparc32/memchr.S index e012844ba..4d57a553b 100644 --- a/libc/string/sparc/sparc32/memchr.S +++ b/libc/string/sparc/sparc32/memchr.S @@ -63,7 +63,7 @@ 1: retl sub %o0, 1, %o0 -ENTRY(__memchr) +ENTRY(memchr) andcc %o1, 0xff, %o1 sll %o1, 8, %g6 andcc %o0, 3, %g0 @@ -136,9 +136,9 @@ ENTRY(__memchr) sub %o0, 3, %o0 4: retl sub %o0, 4, %o0 -END(__memchr) -strong_alias(__memchr,memchr) +END(memchr) +libc_hidden_def(memchr) #if !__BOUNDED_POINTERS__ -weak_alias(__memchr,__ubp_memchr) +weak_alias(memchr,__ubp_memchr) #endif diff --git a/libc/string/sparc/sparc32/memcpy.S b/libc/string/sparc/sparc32/memcpy.S index a1dd246e6..3f40d7822 100644 --- a/libc/string/sparc/sparc32/memcpy.S +++ b/libc/string/sparc/sparc32/memcpy.S @@ -161,14 +161,14 @@ b 3f sub %o0, 2, %o0 -ENTRY(__bcopy) +ENTRY(bcopy) mov %o0, %o3 mov %o1, %o0 mov %o3, %o1 -END(__bcopy) -strong_alias(__bcopy,bcopy) +END(bcopy) +libc_hidden_def(bcopy) -ENTRY(__memmove) +ENTRY(memmove) cmp %o0, %o1 st %o0, [%sp + 64] bleu 9f @@ -448,10 +448,10 @@ ENTRY(__memmove) sub %o2, 2, %o2 b 3f add %o0, 2, %o0 -END(__memmove) -strong_alias(__memmove,memmove) +END(memmove) +libc_hidden_def(memmove) -ENTRY(__memcpy) /* %o0=dst %o1=src %o2=len */ +ENTRY(memcpy) /* %o0=dst %o1=src %o2=len */ sub %o0, %o1, %o4 st %o0, [%sp + 64] 9: andcc %o4, 3, %o5 @@ -966,5 +966,5 @@ ENTRY(__memcpy) /* %o0=dst %o1=src %o2=len */ sub %o7, %o4, %o5 110: retl sub %o7, %g6, %o5 -END(__memcpy) -strong_alias(__memcpy,memcpy) +END(memcpy) +libc_hidden_def(memcpy) diff --git a/libc/string/sparc/sparc32/memset.S b/libc/string/sparc/sparc32/memset.S index b60b881be..41e172cd8 100644 --- a/libc/string/sparc/sparc32/memset.S +++ b/libc/string/sparc/sparc32/memset.S @@ -43,7 +43,7 @@ .text .align 4 -ENTRY(__bzero) +ENTRY(bzero) b 1f mov %g0, %g3 @@ -60,10 +60,10 @@ ENTRY(__bzero) add %o1, %o2, %o1 b 4f sub %o0, %o2, %o0 -END(__bzero) -strong_alias(__bzero,bzero) +END(bzero) +libc_hidden_def(bzero) -ENTRY(__memset) +ENTRY(memset) and %o1, 0xff, %g3 sll %g3, 8, %g2 or %g3, %g2, %g3 @@ -148,5 +148,5 @@ ENTRY(__memset) stb %g3, [%o0 + 6] 0: retl nop -END(__memset) -strong_alias(__memset,memset) +END(memset) +libc_hidden_def(memset) diff --git a/libc/string/sparc/sparc32/stpcpy.S b/libc/string/sparc/sparc32/stpcpy.S index 26d2fecbd..daf116eb1 100644 --- a/libc/string/sparc/sparc32/stpcpy.S +++ b/libc/string/sparc/sparc32/stpcpy.S @@ -65,7 +65,7 @@ 1: retl add %o0, -1, %o0 -ENTRY(__stpcpy) +ENTRY(stpcpy) andcc %o1, 3, %g0 bne 10b sethi %hi(0x80808080), %o4 @@ -156,6 +156,6 @@ ENTRY(__stpcpy) add %o0, 1, %o0 19: retl nop -END(__stpcpy) +END(stpcpy) -strong_alias(__stpcpy,stpcpy) +libc_hidden_def(stpcpy) diff --git a/libc/string/sparc/sparc32/strcat.S b/libc/string/sparc/sparc32/strcat.S index 2ee630b23..eda029a16 100644 --- a/libc/string/sparc/sparc32/strcat.S +++ b/libc/string/sparc/sparc32/strcat.S @@ -91,7 +91,7 @@ b 3f sub %o0, 1, %o0 -ENTRY(__strcat) +ENTRY(strcat) mov %o0, %g2 andcc %o0, 3, %g0 bne 11b @@ -343,6 +343,6 @@ ENTRY(__strcat) srl %o5, 16, %o4 retl mov %g2, %o0 -END(__strcat) +END(strcat) -strong_alias(__strcat,strcat) +libc_hidden_def(strcat) diff --git a/libc/string/sparc/sparc32/strchr.S b/libc/string/sparc/sparc32/strchr.S index 69360c53a..d06bbe3cc 100644 --- a/libc/string/sparc/sparc32/strchr.S +++ b/libc/string/sparc/sparc32/strchr.S @@ -67,7 +67,7 @@ 1: retl sub %o0, 1, %o0 -ENTRY(__strchr) +ENTRY(strchr) andcc %o1, 0xff, %o1 be 12f sll %o1, 8, %o2 @@ -215,11 +215,11 @@ ENTRY(__strchr) 1: or %o4, %lo(0x01010101), %o2 b 7f ld [%o0], %g4 -END(__strchr) -strong_alias(__strchr,strchr) -strong_alias(__strchr,index) +END(strchr) +libc_hidden_def(strchr) +strong_alias(strchr,index) -ENTRY(__strrchr) +ENTRY(strrchr) andcc %o1, 0xff, %o1 clr %o5 be 12b @@ -276,6 +276,6 @@ ENTRY(__strrchr) ld [%o0], %g4 9: retl mov %o5, %o0 -END(__strrchr) -strong_alias(__strrchr,strrchr) -strong_alias(__strrchr,rindex) +END(strrchr) +libc_hidden_def(strrchr) +strong_alias(strrchr,rindex) diff --git a/libc/string/sparc/sparc32/strcmp.S b/libc/string/sparc/sparc32/strcmp.S index 6a807e08a..d43883de6 100644 --- a/libc/string/sparc/sparc32/strcmp.S +++ b/libc/string/sparc/sparc32/strcmp.S @@ -74,7 +74,7 @@ 2: retl mov %o4, %o0 -ENTRY(__strcmp) +ENTRY(strcmp) andcc %o0, 3, %g0 bne 10b sethi %hi(0x80808080), %g1 @@ -252,6 +252,5 @@ ENTRY(__strcmp) ld [%i0], %i4 jmpl %i7 + 8, %g0 restore %g4, %g0, %o0 -END(__strcmp) - -strong_alias(__strcmp,strcmp) +END(strcmp) +libc_hidden_def(strcmp) diff --git a/libc/string/sparc/sparc32/strcpy.S b/libc/string/sparc/sparc32/strcpy.S index ab57e00a5..4d7742ebc 100644 --- a/libc/string/sparc/sparc32/strcpy.S +++ b/libc/string/sparc/sparc32/strcpy.S @@ -63,7 +63,7 @@ b 6f andcc %o0, 3, %g3 -ENTRY(__strcpy) +ENTRY(strcpy) mov %o0, %g2 andcc %o1, 3, %g0 bne 1b @@ -269,6 +269,5 @@ ENTRY(__strcpy) srl %o5, 16, %o4 retl mov %g2, %o0 -END(__strcpy) - -strong_alias(__strcpy,strcpy) +END(strcpy) +libc_hidden_def(strcpy) diff --git a/libc/string/sparc/sparc32/strlen.S b/libc/string/sparc/sparc32/strlen.S index 81beb7f62..4edfe7e78 100644 --- a/libc/string/sparc/sparc32/strlen.S +++ b/libc/string/sparc/sparc32/strlen.S @@ -63,7 +63,7 @@ 3: retl mov 2, %o0 -ENTRY(__strlen) +ENTRY(strlen) mov %o0, %o1 andcc %o0, 3, %g0 bne 10b @@ -98,6 +98,5 @@ ENTRY(__strlen) add %o4, 1, %o4 13: retl sub %o4, %o1, %o0 -END(__strlen) - -strong_alias(__strlen,strlen) +END(strlen) +libc_hidden_def(strlen) diff --git a/libc/string/sparc/sparc64/memchr.S b/libc/string/sparc/sparc64/memchr.S index 7017b5540..6096cc218 100644 --- a/libc/string/sparc/sparc64/memchr.S +++ b/libc/string/sparc/sparc64/memchr.S @@ -54,7 +54,7 @@ .text .align 32 -ENTRY(__memchr) +ENTRY(memchr) and %o1, 0xff, %o1 /* IEU0 Group */ #ifdef USE_BPR brz,pn %o2, 12f /* CTI+IEU1 */ @@ -253,9 +253,9 @@ ENTRY(__memchr) 23: retl /* CTI+IEU1 Group */ add %o0, -1, %o0 /* IEU0 */ -END(__memchr) +END(memchr) -strong_alias(__memchr,memchr) +libc_hidden_def(memchr) #if !__BOUNDED_POINTERS__ -weak_alias(__memchr,__ubp_memchr) +weak_alias(memchr,__ubp_memchr) #endif diff --git a/libc/string/sparc/sparc64/memcpy.S b/libc/string/sparc/sparc64/memcpy.S index 4201b5ec2..4246b3564 100644 --- a/libc/string/sparc/sparc64/memcpy.S +++ b/libc/string/sparc/sparc64/memcpy.S @@ -191,7 +191,7 @@ .text .align 32 -ENTRY(__bcopy) +ENTRY(bcopy) sub %o1, %o0, %o4 /* IEU0 Group */ mov %o0, %g3 /* IEU1 */ cmp %o4, %o2 /* IEU1 Group */ @@ -205,8 +205,8 @@ ENTRY(__bcopy) add %o0, %o2, %o0 /* IEU0 */ retl nop -END(__bcopy) -strong_alias(__bcopy,bcopy) +END(bcopy) +libc_hidden_def(bcopy) .align 32 200: be,pt %xcc, 201f /* CTI */ @@ -504,7 +504,7 @@ END(__align_cpy_16) #endif .align 32 -ENTRY(__memcpy) +ENTRY(memcpy) 210: #ifndef USE_BPR srl %o2, 0, %o2 /* IEU1 Group */ @@ -695,8 +695,8 @@ ENTRY(__memcpy) 214: wr %g0, FPRS_FEF, %fprs retl mov %g4, %o0 -END(__memcpy) -strong_alias(__memcpy,memcpy) +END(memcpy) +libc_hidden_def(memcpy) .align 32 228: andcc %o2, 1, %g0 /* IEU1 Group */ @@ -721,7 +721,7 @@ strong_alias(__memcpy,memcpy) nop .align 32 -ENTRY(__memmove) +ENTRY(memmove) #ifndef USE_BPR srl %o2, 0, %o2 /* IEU1 Group */ #endif @@ -912,10 +912,10 @@ ENTRY(__memmove) 234: wr %g0, FPRS_FEF, %fprs retl mov %g4, %o0 -END(__memmove) -strong_alias(__memmove,memmove) +END(memmove) +libc_hidden_def(memmove) #ifdef USE_BPR -weak_alias(__memcpy,__align_cpy_1) -weak_alias(__memcpy,__align_cpy_2) +weak_alias(memcpy,__align_cpy_1) +weak_alias(memcpy,__align_cpy_2) #endif diff --git a/libc/string/sparc/sparc64/memset.S b/libc/string/sparc/sparc64/memset.S index 6fb25d211..6238f0f97 100644 --- a/libc/string/sparc/sparc64/memset.S +++ b/libc/string/sparc/sparc64/memset.S @@ -36,7 +36,7 @@ /* Well, memset is a lot easier to get right than bcopy... */ .text .align 32 -ENTRY(__memset) +ENTRY(memset) andcc %o1, 0xff, %o1 mov %o0, %o5 be,a,pt %icc, 50f @@ -176,8 +176,8 @@ ENTRY(__memset) nop ba,pt %xcc, 18b ldd [%o0], %f0 -END(__memset) -strong_alias(__memset,memset) +END(memset) +libc_hidden_def(memset) #define ZERO_BLOCKS(base, offset, source) \ stx source, [base - offset - 0x38]; \ @@ -191,7 +191,7 @@ strong_alias(__memset,memset) .text .align 32 -ENTRY(__bzero) +ENTRY(bzero) #ifndef USE_BPR srl %o1, 0, %o1 #endif @@ -309,5 +309,5 @@ ENTRY(__bzero) stb %g0, [%o0 - 1] 0: retl mov %o5, %o0 -END(__bzero) -strong_alias(__bzero,bzero) +END(bzero) +libc_hidden_def(bzero) diff --git a/libc/string/sparc/sparc64/sparcv9b/memcpy.S b/libc/string/sparc/sparc64/sparcv9b/memcpy.S index dd381c7ef..6bfe839ea 100644 --- a/libc/string/sparc/sparc64/sparcv9b/memcpy.S +++ b/libc/string/sparc/sparc64/sparcv9b/memcpy.S @@ -36,7 +36,7 @@ .text .align 32 -ENTRY(__bcopy) +ENTRY(bcopy) sub %o1, %o0, %o4 mov %o0, %g4 cmp %o4, %o2 @@ -50,8 +50,8 @@ ENTRY(__bcopy) add %o0, %o2, %o0 retl nop -END(__bcopy) -strong_alias(__bcopy,bcopy) +END(bcopy) +libc_hidden_def(bcopy) /* Special/non-trivial issues of this code: * @@ -68,7 +68,7 @@ strong_alias(__bcopy,bcopy) * of up to 2.4GB per second. */ .align 32 -ENTRY(__memcpy) +ENTRY(memcpy) 100: /* %o0=dst, %o1=src, %o2=len */ mov %o0, %g5 @@ -329,8 +329,8 @@ small_copy_unaligned: retl mov %g5, %o0 -END(__memcpy) -strong_alias(__memcpy,memcpy) +END(memcpy) +libc_hidden_def(memcpy) #define RMOVE_BIGCHUNK(src, dst, offset, t0, t1, t2, t3) \ ldx [%src - offset - 0x20], %t0; \ @@ -405,7 +405,7 @@ strong_alias(__memcpy,memcpy) mov %g4, %o0 .align 32 -ENTRY(__memmove) +ENTRY(memmove) mov %o0, %g5 #ifndef USE_BPR srl %o2, 0, %o2 /* IEU1 Group */ @@ -597,8 +597,8 @@ ENTRY(__memmove) 234: wr %g0, FPRS_FEF, %fprs retl mov %g4, %o0 -END(__memmove) -strong_alias(__memmove,memmove) +END(memmove) +libc_hidden_def(memmove) #ifdef USE_BPR weak_alias(memcpy,__align_cpy_1) diff --git a/libc/string/sparc/sparc64/stpcpy.S b/libc/string/sparc/sparc64/stpcpy.S index 6bd24cfee..8c26c6bec 100644 --- a/libc/string/sparc/sparc64/stpcpy.S +++ b/libc/string/sparc/sparc64/stpcpy.S @@ -45,7 +45,7 @@ .text .align 32 -ENTRY(__stpcpy) +ENTRY(stpcpy) sethi %hi(0x01010101), %g1 /* IEU0 Group */ or %g1, %lo(0x01010101), %g1 /* IEU0 Group */ andcc %o0, 7, %g0 /* IEU1 */ @@ -267,6 +267,5 @@ ENTRY(__stpcpy) retl /* CTI+IEU1 Group */ mov %g6, %o0 /* IEU0 */ -END(__stpcpy) - -strong_alias(__stpcpy,stpcpy) +END(stpcpy) +libc_hidden_def(stpcpy) diff --git a/libc/string/sparc/sparc64/strcat.S b/libc/string/sparc/sparc64/strcat.S index fb3ad2d12..fcc4ba59c 100644 --- a/libc/string/sparc/sparc64/strcat.S +++ b/libc/string/sparc/sparc64/strcat.S @@ -47,7 +47,7 @@ .text .align 32 -ENTRY(__strcat) +ENTRY(strcat) sethi %hi(0x01010101), %g1 /* IEU0 Group */ ldub [%o0], %o3 /* Load */ or %g1, %lo(0x01010101), %g1 /* IEU0 Group */ @@ -335,6 +335,5 @@ ENTRY(__strcat) stb %o4, [%o0 - 8] /* Store */ retl /* CTI+IEU1 Group */ mov %g6, %o0 /* IEU0 */ -END(__strcat) - -strong_alias(__strcat,strcat) +END(strcat) +libc_hidden_def(strcat) diff --git a/libc/string/sparc/sparc64/strchr.S b/libc/string/sparc/sparc64/strchr.S index 34c30df31..6a371352a 100644 --- a/libc/string/sparc/sparc64/strchr.S +++ b/libc/string/sparc/sparc64/strchr.S @@ -47,7 +47,7 @@ .text .align 32 -ENTRY(__strchr) +ENTRY(strchr) andcc %o1, 0xff, %o1 /* IEU1 Group */ be,pn %icc, 17f /* CTI */ sllx %o1, 8, %g3 /* IEU0 Group */ @@ -327,12 +327,12 @@ ENTRY(__strchr) lduba [%o0] ASI_PNF, %o3 /* Load */ retl /* CTI+IEU1 Group */ add %o0, -1, %o0 /* IEU0 */ -END(__strchr) -strong_alias(__strchr,strchr) -strong_alias(__strchr,index) +END(strchr) +libc_hidden_def(strchr) +strong_alias(strchr,index) .align 32 -ENTRY(__strrchr) +ENTRY(strrchr) andcc %o1, 0xff, %o1 /* IEU1 Group */ be,pn %icc, 17b /* CTI */ clr %g4 /* IEU0 */ @@ -476,6 +476,6 @@ ENTRY(__strrchr) ba,pt %xcc, 1b /* CTI Group */ ldx [%o0], %o3 /* Load */ -END(__strrchr) -strong_alias(__strrchr,strrchr) -strong_alias(__strrchr,rindex) +END(strrchr) +libc_hidden_def(strrchr) +strong_alias(strrchr,rindex) diff --git a/libc/string/sparc/sparc64/strcmp.S b/libc/string/sparc/sparc64/strcmp.S index 0e078e9ac..df9e69179 100644 --- a/libc/string/sparc/sparc64/strcmp.S +++ b/libc/string/sparc/sparc64/strcmp.S @@ -45,7 +45,7 @@ .text .align 32 -ENTRY(__strcmp) +ENTRY(strcmp) sethi %hi(0x01010101), %g1 /* IEU0 Group */ andcc %o0, 7, %g0 /* IEU1 */ bne,pn %icc, 7f /* CTI */ @@ -275,6 +275,5 @@ ENTRY(__strcmp) ba,pt %xcc, 11b /* CTI Group */ ldxa [%o1 + %o0] ASI_PNF, %g6 /* Load */ -END(__strcmp) - -strong_alias(__strcmp,strcmp) +END(strcmp) +libc_hidden_def(strcmp) diff --git a/libc/string/sparc/sparc64/strcpy.S b/libc/string/sparc/sparc64/strcpy.S index d9dff104a..1317d5489 100644 --- a/libc/string/sparc/sparc64/strcpy.S +++ b/libc/string/sparc/sparc64/strcpy.S @@ -45,7 +45,7 @@ .text .align 32 -ENTRY(__strcpy) +ENTRY(strcpy) sethi %hi(0x01010101), %g1 /* IEU0 Group */ mov %o0, %g6 /* IEU1 */ or %g1, %lo(0x01010101), %g1 /* IEU0 Group */ @@ -240,6 +240,6 @@ ENTRY(__strcpy) stb %o4, [%o0 - 8] /* Store */ retl /* CTI+IEU1 Group */ mov %g6, %o0 /* IEU0 */ -END(__strcpy) +END(strcpy) -strong_alias(__strcpy,strcpy) +libc_hidden_def(strcpy) diff --git a/libc/string/sparc/sparc64/strlen.S b/libc/string/sparc/sparc64/strlen.S index 3c1cfc0d8..1fe854961 100644 --- a/libc/string/sparc/sparc64/strlen.S +++ b/libc/string/sparc/sparc64/strlen.S @@ -39,7 +39,7 @@ .text .align 32 -ENTRY(__strlen) +ENTRY(strlen) sethi %hi(0x01010101), %g1 /* IEU0 Group */ ldub [%o0], %o3 /* Load */ or %g1, %lo(0x01010101), %g1 /* IEU0 Group */ @@ -169,6 +169,5 @@ ENTRY(__strlen) add %o0, -1, %o0 /* IEU0 Group */ retl /* CTI+IEU1 Group */ sub %o0, %o1, %o0 /* IEU0 */ -END(__strlen) - -strong_alias(__strlen,strlen) +END(strlen) +libc_hidden_def(strlen) -- cgit v1.2.3