9 files changed, 42 insertions, 45 deletions
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)