summaryrefslogtreecommitdiffstats
path: root/libc/string
diff options
context:
space:
mode:
Diffstat (limited to 'libc/string')
-rw-r--r--libc/string/arm/bcopy.S4
-rw-r--r--libc/string/arm/bzero.S4
-rw-r--r--libc/string/arm/memcmp.S2
-rw-r--r--libc/string/arm/strncmp.S2
-rw-r--r--libc/string/bfin/memchr.S2
-rw-r--r--libc/string/i386/strchr.c2
-rw-r--r--libc/string/i386/strncmp.c2
-rw-r--r--libc/string/i386/strnlen.c2
-rw-r--r--libc/string/i386/strrchr.c2
-rw-r--r--libc/string/ia64/bcopy.S4
-rw-r--r--libc/string/ia64/bzero.S5
-rw-r--r--libc/string/ia64/memcmp.S5
-rw-r--r--libc/string/ia64/strchr.S5
-rw-r--r--libc/string/ia64/strncmp.S2
-rw-r--r--libc/string/sparc/sparc32/memcpy.S4
-rw-r--r--libc/string/sparc/sparc32/memset.S6
-rw-r--r--libc/string/sparc/sparc32/strchr.S6
-rw-r--r--libc/string/sparc/sparc64/memcpy.S3
-rw-r--r--libc/string/sparc/sparc64/memset.S5
-rw-r--r--libc/string/sparc/sparc64/sparcv9b/memcpy.S4
-rw-r--r--libc/string/sparc/sparc64/strchr.S5
-rw-r--r--libc/string/x86_64/bzero.S7
-rw-r--r--libc/string/x86_64/strchr.S2
23 files changed, 75 insertions, 10 deletions
diff --git a/libc/string/arm/bcopy.S b/libc/string/arm/bcopy.S
index 0e559225f..db3c9e6c1 100644
--- a/libc/string/arm/bcopy.S
+++ b/libc/string/arm/bcopy.S
@@ -41,6 +41,8 @@
#include <features.h>
+#ifdef __UCLIBC_SUSV3_LEGACY__
+
.text
.global bcopy
.type bcopy,%function
@@ -54,3 +56,5 @@ bcopy:
b _memcpy /* (PLT) */
.size bcopy,.-bcopy
+
+#endif
diff --git a/libc/string/arm/bzero.S b/libc/string/arm/bzero.S
index c1eb93323..ee49cf560 100644
--- a/libc/string/arm/bzero.S
+++ b/libc/string/arm/bzero.S
@@ -39,6 +39,8 @@
#include <features.h>
+#ifdef __UCLIBC_SUSV3_LEGACY__
+
.text
.global bzero
.type bzero,%function
@@ -50,3 +52,5 @@ bzero:
b HIDDEN_JUMPTARGET(memset)
.size bzero,.-bzero
+
+#endif
diff --git a/libc/string/arm/memcmp.S b/libc/string/arm/memcmp.S
index af1b876ed..4f78b5128 100644
--- a/libc/string/arm/memcmp.S
+++ b/libc/string/arm/memcmp.S
@@ -63,4 +63,6 @@ memcmp:
.size memcmp,.-memcmp
libc_hidden_def(memcmp)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias(memcmp,bcmp)
+#endif
diff --git a/libc/string/arm/strncmp.S b/libc/string/arm/strncmp.S
index d6b36312a..eaf0620b4 100644
--- a/libc/string/arm/strncmp.S
+++ b/libc/string/arm/strncmp.S
@@ -65,4 +65,4 @@ strncmp:
.size strncmp,.-strncmp
-libc_hidden_def(strncmp)
+libc_hidden_weak(strncmp)
diff --git a/libc/string/bfin/memchr.S b/libc/string/bfin/memchr.S
index 6ecaf37a1..23626d6a4 100644
--- a/libc/string/bfin/memchr.S
+++ b/libc/string/bfin/memchr.S
@@ -37,8 +37,8 @@ byte_loop_s:
R3 = B[P0++](Z);
CC = R3 == R1;
IF CC JUMP found;
- NOP;
byte_loop_e:
+ NOP;
failed:
R0=0;
diff --git a/libc/string/i386/strchr.c b/libc/string/i386/strchr.c
index 5ed87e816..7568d48db 100644
--- a/libc/string/i386/strchr.c
+++ b/libc/string/i386/strchr.c
@@ -51,4 +51,6 @@ char *strchr(const char *s, int c)
return __res;
}
libc_hidden_def(strchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias(strchr,index)
+#endif
diff --git a/libc/string/i386/strncmp.c b/libc/string/i386/strncmp.c
index 0c42134e1..d716789c3 100644
--- a/libc/string/i386/strncmp.c
+++ b/libc/string/i386/strncmp.c
@@ -55,4 +55,4 @@ int strncmp(const char *cs, const char *ct, size_t count)
:"1" (cs),"2" (ct),"3" (count));
return __res;
}
-libc_hidden_def(strncmp)
+libc_hidden_weak(strncmp)
diff --git a/libc/string/i386/strnlen.c b/libc/string/i386/strnlen.c
index af512f10a..77b5c7568 100644
--- a/libc/string/i386/strnlen.c
+++ b/libc/string/i386/strnlen.c
@@ -32,6 +32,7 @@
#include <string.h>
+#ifdef __USE_GNU
libc_hidden_proto(strnlen)
size_t strnlen(const char *s, size_t count)
{
@@ -52,3 +53,4 @@ size_t strnlen(const char *s, size_t count)
return __res;
}
libc_hidden_def(strnlen)
+#endif
diff --git a/libc/string/i386/strrchr.c b/libc/string/i386/strrchr.c
index 7af990bd7..e3b2df6fb 100644
--- a/libc/string/i386/strrchr.c
+++ b/libc/string/i386/strrchr.c
@@ -49,4 +49,6 @@ char *strrchr(const char *s, int c)
return __res;
}
libc_hidden_def(strrchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias(strrchr,rindex)
+#endif
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
diff --git a/libc/string/ia64/strncmp.S b/libc/string/ia64/strncmp.S
index 74011650c..8e0373c7f 100644
--- a/libc/string/ia64/strncmp.S
+++ b/libc/string/ia64/strncmp.S
@@ -59,4 +59,4 @@ ENTRY(strncmp)
.restore_and_exit:
br.ret.sptk.many b0
END(strncmp)
-libc_hidden_def (strncmp)
+libc_hidden_weak (strncmp)
diff --git a/libc/string/sparc/sparc32/memcpy.S b/libc/string/sparc/sparc32/memcpy.S
index fb79a601a..25a48844d 100644
--- a/libc/string/sparc/sparc32/memcpy.S
+++ b/libc/string/sparc/sparc32/memcpy.S
@@ -21,6 +21,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
+
/* Both these macros have to start with exactly the same insn */
#define MOVE_BIGCHUNK(src, dst, offset, t0, t1, t2, t3, t4, t5, t6, t7) \
ldd [%src + offset + 0x00], %t0; \
@@ -161,11 +163,13 @@
b 3f
sub %o0, 2, %o0
+#ifdef __UCLIBC_SUSV3_LEGACY__
ENTRY(bcopy)
mov %o0, %o3
mov %o1, %o0
mov %o3, %o1
END(bcopy)
+#endif
ENTRY(memmove)
cmp %o0, %o1
diff --git a/libc/string/sparc/sparc32/memset.S b/libc/string/sparc/sparc32/memset.S
index d5e1350f2..6c6424cf8 100644
--- a/libc/string/sparc/sparc32/memset.S
+++ b/libc/string/sparc/sparc32/memset.S
@@ -20,6 +20,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
+
/* Store 64 bytes at (BASE + OFFSET) using value SOURCE. */
#define ZERO_BIG_BLOCK(base, offset, source) \
std source, [base + offset + 0x00]; \
@@ -43,9 +45,11 @@
.text
.align 4
+#ifdef __UCLIBC_SUSV3_LEGACY__
ENTRY(bzero)
b 1f
mov %g0, %g3
+#endif
3: cmp %o2, 3
be 2f
@@ -60,7 +64,9 @@ ENTRY(bzero)
add %o1, %o2, %o1
b 4f
sub %o0, %o2, %o0
+#ifdef __UCLIBC_SUSV3_LEGACY__
END(bzero)
+#endif
ENTRY(memset)
and %o1, 0xff, %g3
diff --git a/libc/string/sparc/sparc32/strchr.S b/libc/string/sparc/sparc32/strchr.S
index d06bbe3cc..16710d4e8 100644
--- a/libc/string/sparc/sparc32/strchr.S
+++ b/libc/string/sparc/sparc32/strchr.S
@@ -35,6 +35,8 @@
in these days for an average user.
*/
+#include <features.h>
+
.text
.align 4
10: ldub [%o0], %g4
@@ -217,7 +219,9 @@ ENTRY(strchr)
ld [%o0], %g4
END(strchr)
libc_hidden_def(strchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias(strchr,index)
+#endif
ENTRY(strrchr)
andcc %o1, 0xff, %o1
@@ -278,4 +282,6 @@ ENTRY(strrchr)
mov %o5, %o0
END(strrchr)
libc_hidden_def(strrchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias(strrchr,rindex)
+#endif
diff --git a/libc/string/sparc/sparc64/memcpy.S b/libc/string/sparc/sparc64/memcpy.S
index 2fdff7b52..db63d1da2 100644
--- a/libc/string/sparc/sparc64/memcpy.S
+++ b/libc/string/sparc/sparc64/memcpy.S
@@ -20,6 +20,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
#include <asm/asi.h>
#ifndef XCC
#define USE_BPR
@@ -191,6 +192,7 @@
.text
.align 32
+#ifdef __UCLIBC_SUSV3_LEGACY__
ENTRY(bcopy)
sub %o1, %o0, %o4 /* IEU0 Group */
mov %o0, %g3 /* IEU1 */
@@ -206,6 +208,7 @@ ENTRY(bcopy)
retl
nop
END(bcopy)
+#endif
.align 32
200: be,pt %xcc, 201f /* CTI */
diff --git a/libc/string/sparc/sparc64/memset.S b/libc/string/sparc/sparc64/memset.S
index 284713556..50e404bcc 100644
--- a/libc/string/sparc/sparc64/memset.S
+++ b/libc/string/sparc/sparc64/memset.S
@@ -20,6 +20,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
#include <asm/asi.h>
#ifndef XCC
#define XCC xcc
@@ -191,11 +192,13 @@ libc_hidden_def(memset)
.text
.align 32
+#ifdef __UCLIBC_SUSV3_LEGACY__
ENTRY(bzero)
#ifndef USE_BPR
srl %o1, 0, %o1
#endif
mov %o0, %o5
+#endif
50: cmp %o1, 7
bleu,pn %xcc, 17f
andcc %o0, 3, %o2
@@ -309,4 +312,6 @@ ENTRY(bzero)
stb %g0, [%o0 - 1]
0: retl
mov %o5, %o0
+#ifdef __UCLIBC_SUSV3_LEGACY__
END(bzero)
+#endif
diff --git a/libc/string/sparc/sparc64/sparcv9b/memcpy.S b/libc/string/sparc/sparc64/sparcv9b/memcpy.S
index b49c9cde9..64f6a92e0 100644
--- a/libc/string/sparc/sparc64/sparcv9b/memcpy.S
+++ b/libc/string/sparc/sparc64/sparcv9b/memcpy.S
@@ -19,6 +19,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
+
#define ASI_BLK_P 0xf0
#define FPRS_FEF 0x04
#define VISEntryHalf rd %fprs, %o5; wr %g0, FPRS_FEF, %fprs
@@ -36,6 +38,7 @@
.text
.align 32
+#ifdef __UCLIBC_SUSV3_LEGACY__
ENTRY(bcopy)
sub %o1, %o0, %o4
mov %o0, %g4
@@ -51,6 +54,7 @@ ENTRY(bcopy)
retl
nop
END(bcopy)
+#endif
/* Special/non-trivial issues of this code:
*
diff --git a/libc/string/sparc/sparc64/strchr.S b/libc/string/sparc/sparc64/strchr.S
index 6a371352a..da26d1f9c 100644
--- a/libc/string/sparc/sparc64/strchr.S
+++ b/libc/string/sparc/sparc64/strchr.S
@@ -20,6 +20,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <features.h>
#include <asm/asi.h>
#ifndef XCC
#define XCC xcc
@@ -329,7 +330,9 @@ ENTRY(strchr)
add %o0, -1, %o0 /* IEU0 */
END(strchr)
libc_hidden_def(strchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias(strchr,index)
+#endif
.align 32
ENTRY(strrchr)
@@ -478,4 +481,6 @@ ENTRY(strrchr)
ldx [%o0], %o3 /* Load */
END(strrchr)
libc_hidden_def(strrchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias(strrchr,rindex)
+#endif
diff --git a/libc/string/x86_64/bzero.S b/libc/string/x86_64/bzero.S
index b6e41fb0f..4d179ec4e 100644
--- a/libc/string/x86_64/bzero.S
+++ b/libc/string/x86_64/bzero.S
@@ -1,2 +1,5 @@
-#define memset bzero
-#include "memset.S"
+#include <features.h>
+#ifdef __UCLIBC_SUSV3_LEGACY__
+# define memset bzero
+# include "memset.S"
+#endif
diff --git a/libc/string/x86_64/strchr.S b/libc/string/x86_64/strchr.S
index 6f6635a39..8e59c4c19 100644
--- a/libc/string/x86_64/strchr.S
+++ b/libc/string/x86_64/strchr.S
@@ -285,4 +285,6 @@ ENTRY (BP_SYM (strchr))
END (BP_SYM (strchr))
libc_hidden_def(strchr)
+#ifdef __UCLIBC_SUSV3_LEGACY__
strong_alias (BP_SYM (strchr), BP_SYM (index))
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 13:21:49 +0000