Add new option for SuSv3 legacy functions and use it for bcopy/bzero/bcmp/index/rindex

4 files changed, 15 insertions, 4 deletions

diff --git a/libc/string/ia64/bcopy.S b/libc/string/ia64/bcopy.S
index c4eb22b1f..c5637c369 100644
--- a/libc/string/ia64/bcopy.S
+++ b/libc/string/ia64/bcopy.S
@@ -1,5 +1,7 @@
 #include "sysdep.h"
 
+#ifdef __UCLIBC_SUSV3_LEGACY__
+
 ENTRY(bcopy)
 	.regstk 3, 0, 0, 0
 	mov r8 = in0
@@ -8,3 +10,5 @@ ENTRY(bcopy)
 	mov in1 = r8
 	br.cond.sptk.many HIDDEN_JUMPTARGET(memmove)
 END(bcopy)
+
+#endif
diff --git a/libc/string/ia64/bzero.S b/libc/string/ia64/bzero.S
index 0e2ff09cc..d390838a6 100644
--- a/libc/string/ia64/bzero.S
+++ b/libc/string/ia64/bzero.S
@@ -33,6 +33,9 @@
    to get peak speed.  */
 
 #include "sysdep.h"
+
+#ifdef __UCLIBC_SUSV3_LEGACY__
+
 #undef ret
 
 #define dest		in0
@@ -313,3 +316,5 @@ ENTRY(bzero)
 	br.ret.sptk.many rp
 ;; }
 END(bzero)
+
+#endif
diff --git a/libc/string/ia64/memcmp.S b/libc/string/ia64/memcmp.S
index c6ea7529b..8b0c096ce 100644
--- a/libc/string/ia64/memcmp.S
+++ b/libc/string/ia64/memcmp.S
@@ -160,6 +160,7 @@ ENTRY(memcmp)
 	mov 	ar.lc = saved_lc	// restore the loop counter
 	br.ret.sptk.many b0
 END(memcmp)
-
-weak_alias (memcmp, bcmp)
 libc_hidden_def (memcmp)
+#ifdef __UCLIBC_SUSV3_LEGACY__
+strong_alias (memcmp, bcmp)
+#endif
diff --git a/libc/string/ia64/strchr.S b/libc/string/ia64/strchr.S
index 7d1a0834e..401a07941 100644
--- a/libc/string/ia64/strchr.S
+++ b/libc/string/ia64/strchr.S
@@ -107,6 +107,7 @@ ENTRY(strchr)
 	ld8	val2 = [ret0], 8	// bomb out here
 	br.cond.sptk	.back
 END(strchr)
-
-weak_alias (strchr, index)
 libc_hidden_def (strchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
+strong_alias (strchr, index)
+#endif