[v9,2/3] String: Add hidden defs for __memcmpeq() to enable internal usage
Checks
Commit Message
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.
---
include/string.h | 1 +
string/memcmp.c | 1 +
sysdeps/aarch64/memcmp.S | 1 +
sysdeps/csky/abiv2/memcmp.S | 1 +
sysdeps/i386/i686/memcmp.S | 1 +
sysdeps/i386/i686/multiarch/memcmp.c | 1 +
sysdeps/i386/memcmp.S | 1 +
sysdeps/ia64/memcmp.S | 1 +
sysdeps/powerpc/powerpc32/405/memcmp.S | 1 +
sysdeps/powerpc/powerpc32/power4/memcmp.S | 1 +
sysdeps/powerpc/powerpc32/power7/memcmp.S | 1 +
sysdeps/powerpc/powerpc64/le/power10/memcmp.S | 1 +
sysdeps/powerpc/powerpc64/power4/memcmp.S | 1 +
sysdeps/powerpc/powerpc64/power7/memcmp.S | 1 +
sysdeps/powerpc/powerpc64/power8/memcmp.S | 1 +
sysdeps/s390/memcmp-z900.S | 1 +
sysdeps/s390/memcmp.c | 1 +
sysdeps/sparc/sparc64/memcmp.S | 1 +
sysdeps/x86_64/memcmp.S | 1 +
sysdeps/x86_64/multiarch/memcmp.c | 1 +
20 files changed, 20 insertions(+)
Comments
On Thu, Oct 21, 2021 at 10:51 PM Noah Goldstein <goldstein.w.n@gmail.com> wrote:
>
> 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.
> ---
> include/string.h | 1 +
> string/memcmp.c | 1 +
> sysdeps/aarch64/memcmp.S | 1 +
> sysdeps/csky/abiv2/memcmp.S | 1 +
> sysdeps/i386/i686/memcmp.S | 1 +
> sysdeps/i386/i686/multiarch/memcmp.c | 1 +
> sysdeps/i386/memcmp.S | 1 +
> sysdeps/ia64/memcmp.S | 1 +
> sysdeps/powerpc/powerpc32/405/memcmp.S | 1 +
> sysdeps/powerpc/powerpc32/power4/memcmp.S | 1 +
> sysdeps/powerpc/powerpc32/power7/memcmp.S | 1 +
> sysdeps/powerpc/powerpc64/le/power10/memcmp.S | 1 +
> sysdeps/powerpc/powerpc64/power4/memcmp.S | 1 +
> sysdeps/powerpc/powerpc64/power7/memcmp.S | 1 +
> sysdeps/powerpc/powerpc64/power8/memcmp.S | 1 +
> sysdeps/s390/memcmp-z900.S | 1 +
> sysdeps/s390/memcmp.c | 1 +
> sysdeps/sparc/sparc64/memcmp.S | 1 +
> sysdeps/x86_64/memcmp.S | 1 +
> sysdeps/x86_64/multiarch/memcmp.c | 1 +
> 20 files changed, 20 insertions(+)
>
> diff --git a/include/string.h b/include/string.h
> index 81dab39891..21f641a413 100644
> --- 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 6e93a3128f..dc1a94e6ea 100644
> --- a/string/memcmp.c
> +++ b/string/memcmp.c
> @@ -360,4 +360,5 @@ libc_hidden_builtin_def(memcmp)
> weak_alias (memcmp, bcmp)
> # undef __memcmpeq
> strong_alias (memcmp, __memcmpeq)
> +libc_hidden_def (__memcmpeq)
> #endif
> diff --git a/sysdeps/aarch64/memcmp.S b/sysdeps/aarch64/memcmp.S
> index 37f37b9191..5dc4ee5f0b 100644
> --- 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 2a4ae577b0..9aacfd4cab 100644
> --- 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 90266d904b..cc3329bef4 100644
> --- 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.c b/sysdeps/i386/i686/multiarch/memcmp.c
> index 3b2815edbc..eb7cb9f2e2 100644
> --- 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 02473c2c0c..f224db4681 100644
> --- 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 7722908751..3ab04d4f8a 100644
> --- 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 c2836040a7..339091be0d 100644
> --- 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 f58e34aba5..0df97dbf49 100644
> --- 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/power7/memcmp.S b/sysdeps/powerpc/powerpc32/power7/memcmp.S
> index f8deb4e32c..25be9a7f51 100644
> --- 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 f81c73a29c..b0cd3ddde7 100644
> --- 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/power4/memcmp.S b/sysdeps/powerpc/powerpc64/power4/memcmp.S
> index cc82be115f..3731bb0a73 100644
> --- 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 3044f7ede9..29ae19d843 100644
> --- 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 0c6a154502..897a5713ce 100644
> --- 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 d625bf90dd..5808f9365d 100644
> --- 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 52c20af772..cc58279389 100644
> --- 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 fefeee5f5d..d237945554 100644
> --- 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 f60ddb2ed1..7b7a9dc8e7 100644
> --- a/sysdeps/x86_64/memcmp.S
> +++ b/sysdeps/x86_64/memcmp.S
> @@ -362,3 +362,4 @@ weak_alias (memcmp, bcmp)
> definition coming from IFUNC in multiarch/memcmp.c. */
> weak_alias (memcmp, __memcmpeq)
> libc_hidden_builtin_def (memcmp)
> +libc_hidden_builtin_def (__memcmpeq)
> diff --git a/sysdeps/x86_64/multiarch/memcmp.c b/sysdeps/x86_64/multiarch/memcmp.c
> index 4a3aad2c9c..7b3409b1dd 100644
> --- 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)
> --
> 2.25.1
>
LGTM.
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
Thanks.
@@ -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)
@@ -360,4 +360,5 @@ libc_hidden_builtin_def(memcmp)
weak_alias (memcmp, bcmp)
# undef __memcmpeq
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
#endif
@@ -180,3 +180,4 @@ weak_alias (memcmp, bcmp)
#undef __memcmpeq
strong_alias (memcmp, __memcmpeq)
libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)
@@ -140,4 +140,5 @@ END (memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
libc_hidden_def (memcmp)
+libc_hidden_def (__memcmpeq)
.weak memcmp
@@ -408,3 +408,4 @@ weak_alias (memcmp, bcmp)
#undef __memcmpeq
strong_alias (memcmp, __memcmpeq)
libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)
@@ -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
@@ -73,3 +73,4 @@ weak_alias (memcmp, bcmp)
#undef __memcmpeq
strong_alias (memcmp, __memcmpeq)
libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)
@@ -162,3 +162,4 @@ END(memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)
@@ -127,3 +127,4 @@ END (memcmp)
libc_hidden_builtin_def (memcmp)
weak_alias (memcmp,bcmp)
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
@@ -1374,3 +1374,4 @@ END (memcmp)
libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
@@ -1374,3 +1374,4 @@ END (memcmp)
libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
@@ -178,3 +178,4 @@ END (MEMCMP)
libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
@@ -1375,3 +1375,4 @@ END (MEMCMP)
libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
@@ -1060,3 +1060,4 @@ END (MEMCMP)
libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
@@ -1443,3 +1443,4 @@ END (MEMCMP)
libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp)
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
@@ -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)
@@ -47,4 +47,5 @@ s390_libc_ifunc_expr (__redirect_memcmp, memcmp,
)
weak_alias (memcmp, bcmp);
strong_alias (memcmp, __memcmpeq)
+libc_hidden_def (__memcmpeq)
#endif
@@ -140,3 +140,4 @@ weak_alias (memcmp, bcmp)
#undef __memcmpeq
strong_alias (memcmp, __memcmpeq)
libc_hidden_builtin_def (memcmp)
+libc_hidden_def (__memcmpeq)
@@ -362,3 +362,4 @@ weak_alias (memcmp, bcmp)
definition coming from IFUNC in multiarch/memcmp.c. */
weak_alias (memcmp, __memcmpeq)
libc_hidden_builtin_def (memcmp)
+libc_hidden_builtin_def (__memcmpeq)
@@ -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)