String: Add hidden defs for __memcmpeq() to enable internal usage

No bug.

This commit adds hidden defs for all declarations of __memcmpeq. This
enables usage of __memcmpeq without the PLT for usage internal to
GLIBC.

diff --git a/include/string.h b/include/string.h
index 81dab39891b3f4a0158990d030cab5fd090a8d08..21f641a413918ff4ae18ab2e85a6f66367a4f96c 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -112,6 +112,7 @@ extern char *__strsep_g (char **__stringp, const char *__delim);
 libc_hidden_proto (__strsep_g)
 libc_hidden_proto (strnlen)
 libc_hidden_proto (__strnlen)
+libc_hidden_proto (__memcmpeq)
 libc_hidden_proto (memmem)
 extern __typeof (memmem) __memmem;
 libc_hidden_proto (__memmem)

diff --git a/string/memcmp.c b/string/memcmp.c
index eac411253050c0e7a890a2f1a8fa57cb0481349f..4620e79f2964c550d85d9aaf0d58dd7482568375 100644 (file)
--- a/string/memcmp.c
+++ b/string/memcmp.c
@@ -362,3 +362,4 @@ weak_alias (memcmp, bcmp)
 
 #undef __memcmpeq
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def(__memcmpeq)

diff --git a/sysdeps/aarch64/memcmp.S b/sysdeps/aarch64/memcmp.S
index 37f37b91914c518bedcd5b740a0b734f43c28bd1..5dc4ee5f0b018daed29b57b22e8c969af5b37583 100644 (file)
--- a/sysdeps/aarch64/memcmp.S
+++ b/sysdeps/aarch64/memcmp.S
@@ -180,3 +180,4 @@ weak_alias (memcmp, bcmp)
 #undef __memcmpeq
 strong_alias (memcmp, __memcmpeq)
 libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/csky/abiv2/memcmp.S b/sysdeps/csky/abiv2/memcmp.S
index 2a4ae577b024277dde4d347c3ada97d459cda237..9aacfd4cab802fce4586f032768b7c13436dfd9f 100644 (file)
--- a/sysdeps/csky/abiv2/memcmp.S
+++ b/sysdeps/csky/abiv2/memcmp.S
@@ -140,4 +140,5 @@ END (memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
 libc_hidden_def (memcmp)
+libc_hidden_def (__memcmpeq)
 .weak memcmp

diff --git a/sysdeps/i386/i686/memcmp.S b/sysdeps/i386/i686/memcmp.S
index 90266d904b52368ab8c07331d6129adc3cf3f8a9..cc3329bef4bd658418ba99846b6b7f5019058a31 100644 (file)
--- a/sysdeps/i386/i686/memcmp.S
+++ b/sysdeps/i386/i686/memcmp.S
@@ -408,3 +408,4 @@ weak_alias (memcmp, bcmp)
 #undef __memcmpeq
 strong_alias (memcmp, __memcmpeq)
 libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/i386/i686/multiarch/memcmp-ia32.S b/sysdeps/i386/i686/multiarch/memcmp-ia32.S
index a5b5c3d3491f2e5af224a91105962ed5d5dbdf76..74188f74abfdfeff4a202a1fe29d0540a30b158d 100644 (file)
--- a/sysdeps/i386/i686/multiarch/memcmp-ia32.S
+++ b/sysdeps/i386/i686/multiarch/memcmp-ia32.S
@@ -26,6 +26,10 @@
    used by IFUNC.  */
 #  define libc_hidden_builtin_def(name) \
        .globl __GI_memcmp; __GI_memcmp = memcmp
+
+#  undef libc_hidden_def
+#  define libc_hidden_def(name) \
+       .globl __GI___memcmpeq; __GI___memcmpeq = __memcmpeq
 # endif
 
 # undef weak_alias

diff --git a/sysdeps/i386/i686/multiarch/memcmp.c b/sysdeps/i386/i686/multiarch/memcmp.c
index 3b2815edbc4d9d54e9686f681dff4739640639c5..eb7cb9f2e242a3ca744bcd5ce6efbe9190eedea5 100644 (file)
--- a/sysdeps/i386/i686/multiarch/memcmp.c
+++ b/sysdeps/i386/i686/multiarch/memcmp.c
@@ -30,4 +30,5 @@ libc_ifunc_redirected (__redirect_memcmp, memcmp, IFUNC_SELECTOR ());
 
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
 #endif

diff --git a/sysdeps/i386/memcmp.S b/sysdeps/i386/memcmp.S
index 02473c2c0c827ba2f671b0139bf2e96c8cd34152..f224db4681d3b67dcf803c1556713510fc2de48b 100644 (file)
--- a/sysdeps/i386/memcmp.S
+++ b/sysdeps/i386/memcmp.S
@@ -73,3 +73,4 @@ weak_alias (memcmp, bcmp)
 #undef __memcmpeq
 strong_alias (memcmp, __memcmpeq)
 libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/ia64/memcmp.S b/sysdeps/ia64/memcmp.S
index 7722908751688d30539599dfb156856c12a340ff..3ab04d4f8a2d8f258dfa7593b855951c11dabbc7 100644 (file)
--- a/sysdeps/ia64/memcmp.S
+++ b/sysdeps/ia64/memcmp.S
@@ -162,3 +162,4 @@ END(memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
 libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/powerpc/powerpc32/405/memcmp.S b/sysdeps/powerpc/powerpc32/405/memcmp.S
index c2836040a7783fb2ced0a0227a715ad2462f8f51..339091be0db17dddece5d75191642d5ec6f22bd7 100644 (file)
--- a/sysdeps/powerpc/powerpc32/405/memcmp.S
+++ b/sysdeps/powerpc/powerpc32/405/memcmp.S
@@ -127,3 +127,4 @@ END (memcmp)
 libc_hidden_builtin_def (memcmp)
 weak_alias (memcmp,bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/powerpc/powerpc32/power4/memcmp.S b/sysdeps/powerpc/powerpc32/power4/memcmp.S
index f58e34aba5c2d3dc27a1b09cf66859e3c948601b..0df97dbf498e51a4c074f2bb29094cf887216537 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/memcmp.S
+++ b/sysdeps/powerpc/powerpc32/power4/memcmp.S
@@ -1374,3 +1374,4 @@ END (memcmp)
 libc_hidden_builtin_def (memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-power7.S b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-power7.S
index b17d0e43b77e532d34f3cefcc40716e03adc1e79..cb1338c65023ac1ed2341fcecf2294b8f7035829 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-power7.S
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-power7.S
@@ -35,6 +35,9 @@
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
 
+#undef libc_hidden_def
+#define libc_hidden_def(name)
+
 #undef weak_alias
 #define weak_alias(a, b)
 

diff --git a/sysdeps/powerpc/powerpc32/power7/memcmp.S b/sysdeps/powerpc/powerpc32/power7/memcmp.S
index f8deb4e32cfcce9fa3345e2a080d4c697a98e817..25be9a7f51586a55c74cabfc0ce3266a9517e9ee 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power7/memcmp.S
+++ b/sysdeps/powerpc/powerpc32/power7/memcmp.S
@@ -1374,3 +1374,4 @@ END (memcmp)
 libc_hidden_builtin_def (memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/powerpc/powerpc64/le/power10/memcmp.S b/sysdeps/powerpc/powerpc64/le/power10/memcmp.S
index f81c73a29c7f65e5f4492354941479803f41837b..b0cd3ddde7537a5ebfaa16a334d4b3da940e591f 100644 (file)
--- a/sysdeps/powerpc/powerpc64/le/power10/memcmp.S
+++ b/sysdeps/powerpc/powerpc64/le/power10/memcmp.S
@@ -178,3 +178,4 @@ END (MEMCMP)
 libc_hidden_builtin_def (memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power10.S b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power10.S
index 22399f143d089b131c9cb97e09c6ef3f37f0c21a..07a83b07b9cbf50d54007c43bf5f8dd858b5c725 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power10.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power10.S
@@ -20,6 +20,8 @@
 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
+#undef libc_hidden_def
+#define libc_hidden_def(name)
 #undef weak_alias
 #define weak_alias(name,alias)
 #undef strong_alias

diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
index fe68912a3b34791651519f4cc09e794dfcef393d..3308222a4b37cafe7e069435b039c4e0e0152dcb 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
@@ -20,6 +20,8 @@
 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
+#undef libc_hidden_def
+#define libc_hidden_def(name)
 #undef weak_alias
 #define weak_alias(name,alias)
 #undef strong_alias

diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
index 5739471a7d1a4f65c59ec12d827fb55518aa142e..b02174b32856cfc08588c59ebdc68e2df2584d44 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
@@ -20,6 +20,8 @@
 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
+#undef libc_hidden_def
+#define libc_hidden_def(name)
 #undef weak_alias
 #define weak_alias(name,alias)
 #undef strong_alias

diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
index e6a93e88c616961eff79fc1fb1cce8a1ebc91fed..5eb4b586917f1d1e769a49532bff0a1dc513db73 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S
@@ -20,6 +20,8 @@
 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
+#undef libc_hidden_def
+#define libc_hidden_def(name)
 #undef weak_alias
 #define weak_alias(name,alias)
 #undef strong_alias

diff --git a/sysdeps/powerpc/powerpc64/power4/memcmp.S b/sysdeps/powerpc/powerpc64/power4/memcmp.S
index cc82be115ff2bd8ec26e1f8992f71c6d0b553ca8..3731bb0a732b588f4d0ecd50cac8099f247d43b0 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power4/memcmp.S
+++ b/sysdeps/powerpc/powerpc64/power4/memcmp.S
@@ -1375,3 +1375,4 @@ END (MEMCMP)
 libc_hidden_builtin_def (memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/powerpc/powerpc64/power7/memcmp.S b/sysdeps/powerpc/powerpc64/power7/memcmp.S
index 3044f7ede95ca9bde75f2f99541071d1c47be1b8..29ae19d843406e561a8d2a042bd19e6c4d21bf70 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power7/memcmp.S
+++ b/sysdeps/powerpc/powerpc64/power7/memcmp.S
@@ -1060,3 +1060,4 @@ END (MEMCMP)
 libc_hidden_builtin_def (memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/powerpc/powerpc64/power8/memcmp.S b/sysdeps/powerpc/powerpc64/power8/memcmp.S
index 0c6a154502719064fb448ec9dc9acf893578aa3c..897a5713ce3dfcabe9bb03daa9e41a35a582bac0 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power8/memcmp.S
+++ b/sysdeps/powerpc/powerpc64/power8/memcmp.S
@@ -1443,3 +1443,4 @@ END (MEMCMP)
 libc_hidden_builtin_def (memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/s390/memcmp-z900.S b/sysdeps/s390/memcmp-z900.S
index d625bf90dd7250eeab4a96dff1e470cb4025cd3c..5808f9365d0352296ef627c932e7b1858bb1a70c 100644 (file)
--- a/sysdeps/s390/memcmp-z900.S
+++ b/sysdeps/s390/memcmp-z900.S
@@ -165,6 +165,7 @@ END(MEMCMP_Z196)
 strong_alias (MEMCMP_DEFAULT, memcmp)
 weak_alias (memcmp, bcmp)
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
 #endif
 
 #if defined SHARED && IS_IN (libc)

diff --git a/sysdeps/s390/memcmp.c b/sysdeps/s390/memcmp.c
index 52c20af77229d92fd7d2d53ffd115ebf258f78b4..cc58279389661f5d0934aecbf4ce3f480f50f69a 100644 (file)
--- a/sysdeps/s390/memcmp.c
+++ b/sysdeps/s390/memcmp.c
@@ -47,4 +47,5 @@ s390_libc_ifunc_expr (__redirect_memcmp, memcmp,
                      )
 weak_alias (memcmp, bcmp);
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
 #endif

diff --git a/sysdeps/sparc/sparc64/memcmp.S b/sysdeps/sparc/sparc64/memcmp.S
index fefeee5f5d22cb53cec231f20c10e88391967dc1..d237945554cafc719d052f0a607d468cc4d13848 100644 (file)
--- a/sysdeps/sparc/sparc64/memcmp.S
+++ b/sysdeps/sparc/sparc64/memcmp.S
@@ -140,3 +140,4 @@ weak_alias (memcmp, bcmp)
 #undef __memcmpeq
 strong_alias (memcmp, __memcmpeq)
 libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S
index 1b351ee092b75ff7cf5fba0c028d0d53ffca51f3..8a03e572e8c6cb9064e891ad986647b71cb3612f 100644 (file)
--- a/sysdeps/x86_64/memcmp.S
+++ b/sysdeps/x86_64/memcmp.S
@@ -361,3 +361,4 @@ weak_alias (memcmp, bcmp)
 #undef __memcmpeq
 strong_alias (memcmp, __memcmpeq)
 libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)

diff --git a/sysdeps/x86_64/multiarch/memcmp-sse2.S b/sysdeps/x86_64/multiarch/memcmp-sse2.S
index af737c5e6c65e9b2289bcaba2be0f4a5eb4c09e6..7b30b7ca2ebd3d55b0b1d0eb5d40a4c0777b5328 100644 (file)
--- a/sysdeps/x86_64/multiarch/memcmp-sse2.S
+++ b/sysdeps/x86_64/multiarch/memcmp-sse2.S
@@ -22,6 +22,9 @@
 # ifdef SHARED
 #  undef libc_hidden_builtin_def
 #  define libc_hidden_builtin_def(name)
+
+#  undef libc_hidden_def
+#  define libc_hidden_def(ignored)
 # endif
 
 # undef weak_alias

diff --git a/sysdeps/x86_64/multiarch/memcmp.c b/sysdeps/x86_64/multiarch/memcmp.c
index 4a3aad2c9c4a58fdf526fcae74b3fda941429561..7b3409b1dd804cc7ecd969741bb360c6186185b8 100644 (file)
--- a/sysdeps/x86_64/multiarch/memcmp.c
+++ b/sysdeps/x86_64/multiarch/memcmp.c
@@ -31,6 +31,7 @@ libc_ifunc_redirected (__redirect_memcmp, memcmp, IFUNC_SELECTOR ());
 weak_alias (memcmp, bcmp)
 # undef __memcmpeq
 strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
 
 # ifdef SHARED
 __hidden_ver1 (memcmp, __GI_memcmp, __redirect_memcmp)