From 22999b2f0fb62eed1af4095d062bd1272d6afeb1 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 6 Feb 2023 15:05:56 -0300 Subject: string: Add libc_hidden_proto for memrchr Although static linker can optimize it to local call, it follows the internal scheme to provide hidden proto and definitions. Reviewed-by: Carlos Eduardo Seo --- include/string.h | 1 + string/memrchr.c | 1 + sysdeps/aarch64/memrchr.S | 1 + sysdeps/i386/i686/multiarch/memrchr-sse2.S | 1 + sysdeps/i386/i686/multiarch/memrchr.c | 2 ++ .../powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c | 10 ++++++++++ sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c | 12 ++++++------ sysdeps/powerpc/powerpc32/power7/memrchr.S | 1 + sysdeps/powerpc/powerpc64/multiarch/memrchr.c | 18 +++++++++--------- sysdeps/powerpc/powerpc64/power7/memrchr.S | 1 + sysdeps/powerpc/powerpc64/power8/memrchr.S | 1 + sysdeps/s390/memrchr-c.c | 4 ++++ sysdeps/s390/memrchr.c | 8 +++++--- sysdeps/x86_64/memrchr.S | 1 + sysdeps/x86_64/multiarch/memrchr.c | 1 + 15 files changed, 45 insertions(+), 18 deletions(-) diff --git a/include/string.h b/include/string.h index 6e364e8..a9120ff 100644 --- a/include/string.h +++ b/include/string.h @@ -119,6 +119,7 @@ extern __typeof (memmem) __memmem; libc_hidden_proto (__memmem) libc_hidden_proto (__ffs) libc_hidden_proto (__strerror_l) +libc_hidden_proto (__memrchr) #if IS_IN (libc) /* Avoid hidden reference to IFUNC symbol __explicit_bzero_chk. */ diff --git a/string/memrchr.c b/string/memrchr.c index b37f2a6..3de5ec6 100644 --- a/string/memrchr.c +++ b/string/memrchr.c @@ -75,5 +75,6 @@ __memrchr (const void *s, int c_in, size_t n) return NULL; } #ifndef MEMRCHR +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) #endif diff --git a/sysdeps/aarch64/memrchr.S b/sysdeps/aarch64/memrchr.S index 621fc65..af7d847 100644 --- a/sysdeps/aarch64/memrchr.S +++ b/sysdeps/aarch64/memrchr.S @@ -123,5 +123,6 @@ L(nomatch): ret END (__memrchr) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S index c2c37f7..aa15e7c 100644 --- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S @@ -720,4 +720,5 @@ L(ret_null): ret END (__memrchr_sse2) +strong_alias (__memrchr_sse2, __GI___memrchr) #endif diff --git a/sysdeps/i386/i686/multiarch/memrchr.c b/sysdeps/i386/i686/multiarch/memrchr.c index c820a9d..80dca18 100644 --- a/sysdeps/i386/i686/multiarch/memrchr.c +++ b/sysdeps/i386/i686/multiarch/memrchr.c @@ -20,8 +20,10 @@ /* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define memrchr __redirect_memrchr +# define __memrchr __redirect___memrchr # include # undef memrchr +# undef __memrchr # define SYMBOL_NAME memrchr # include "ifunc-sse2-bsf.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c index 62e7a12..038c5f4 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c @@ -23,3 +23,13 @@ extern void *__memrchr_ppc (const void *, int, size_t); #endif #include +# if IS_IN (libc) +# undef __memrchr +# ifdef SHARED +__hidden_ver1 (__memrchr_ppc, __GI___memrchr, __memrchr_ppc); +strong_alias (__memrchr_ppc, __memrchr_ppc1); +__hidden_ver1 (__memrchr_ppc1, __memrchr, __memrchr_ppc1); +# else +strong_alias (__memrchr_ppc, __memrchr) +# endif +#endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c index 8c1385f..fb0d2c0 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c @@ -17,21 +17,21 @@ . */ #if IS_IN (libc) +# define memrchr __redirect_memrchr # include # include # include "init-arch.h" extern __typeof (__memrchr) __memrchr_ppc attribute_hidden; extern __typeof (__memrchr) __memrchr_power7 attribute_hidden; +# undef memrchr /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle ifunc symbol properly. */ -libc_ifunc (__memrchr, - (hwcap & PPC_FEATURE_HAS_VSX) - ? __memrchr_power7 - : __memrchr_ppc); - -weak_alias (__memrchr, memrchr) +libc_ifunc_redirected (__redirect_memrchr, memrchr, + (hwcap & PPC_FEATURE_HAS_VSX) + ? __memrchr_power7 + : __memrchr_ppc); #else #include #endif diff --git a/sysdeps/powerpc/powerpc32/power7/memrchr.S b/sysdeps/powerpc/powerpc32/power7/memrchr.S index 9c70517..9f0f17f 100644 --- a/sysdeps/powerpc/powerpc32/power7/memrchr.S +++ b/sysdeps/powerpc/powerpc32/power7/memrchr.S @@ -191,5 +191,6 @@ L(loop_small): blr END (__memrchr) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c index 59527a8..5e7c00f 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c @@ -17,6 +17,7 @@ . */ #if IS_IN (libc) +# define memrchr __redirect_memrchr # include # include # include "init-arch.h" @@ -24,18 +25,17 @@ extern __typeof (__memrchr) __memrchr_ppc attribute_hidden; extern __typeof (__memrchr) __memrchr_power7 attribute_hidden; extern __typeof (__memrchr) __memrchr_power8 attribute_hidden; +# undef memrchr /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle ifunc symbol properly. */ -libc_ifunc (__memrchr, - (hwcap2 & PPC_FEATURE2_ARCH_2_07 - && hwcap & PPC_FEATURE_HAS_ALTIVEC) - ? __memrchr_power8 : - (hwcap & PPC_FEATURE_ARCH_2_06) - ? __memrchr_power7 - : __memrchr_ppc); - -weak_alias (__memrchr, memrchr) +libc_ifunc_redirected (__redirect_memrchr, memrchr, + (hwcap2 & PPC_FEATURE2_ARCH_2_07 + && hwcap & PPC_FEATURE_HAS_ALTIVEC) + ? __memrchr_power8 : + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __memrchr_power7 + : __memrchr_ppc); #else #include #endif diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64/power7/memrchr.S index 56e79f3..3b0430c 100644 --- a/sysdeps/powerpc/powerpc64/power7/memrchr.S +++ b/sysdeps/powerpc/powerpc64/power7/memrchr.S @@ -196,5 +196,6 @@ L(loop_small): blr END (MEMRCHR) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/powerpc/powerpc64/power8/memrchr.S b/sysdeps/powerpc/powerpc64/power8/memrchr.S index fec76cf..ebe4017 100644 --- a/sysdeps/powerpc/powerpc64/power8/memrchr.S +++ b/sysdeps/powerpc/powerpc64/power8/memrchr.S @@ -332,5 +332,6 @@ L(loop_small): blr END (MEMRCHR) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/s390/memrchr-c.c b/sysdeps/s390/memrchr-c.c index ce97bc6..bdf3c7b 100644 --- a/sysdeps/s390/memrchr-c.c +++ b/sysdeps/s390/memrchr-c.c @@ -24,4 +24,8 @@ # endif # include + +# if defined SHARED && IS_IN (libc) +__hidden_ver1 (__memrchr_c, __GI___memrchr, __memrchr_c); +# endif #endif diff --git a/sysdeps/s390/memrchr.c b/sysdeps/s390/memrchr.c index 73e7562..405990f 100644 --- a/sysdeps/s390/memrchr.c +++ b/sysdeps/s390/memrchr.c @@ -19,18 +19,20 @@ #include #if HAVE_MEMRCHR_IFUNC +# define __memrchr __redirect_memrchr # include +# undef __memrchr # include # if HAVE_MEMRCHR_C -extern __typeof (__memrchr) MEMRCHR_C attribute_hidden; +extern __typeof (__redirect_memrchr) MEMRCHR_C attribute_hidden; # endif # if HAVE_MEMRCHR_Z13 -extern __typeof (__memrchr) MEMRCHR_Z13 attribute_hidden; +extern __typeof (__redirect_memrchr) MEMRCHR_Z13 attribute_hidden; # endif -s390_libc_ifunc_expr (__memrchr, __memrchr, +s390_libc_ifunc_expr (__redirect_memrchr, __memrchr, (HAVE_MEMRCHR_Z13 && (hwcap & HWCAP_S390_VX)) ? MEMRCHR_Z13 : MEMRCHR_DEFAULT diff --git a/sysdeps/x86_64/memrchr.S b/sysdeps/x86_64/memrchr.S index fe33998..98a220f 100644 --- a/sysdeps/x86_64/memrchr.S +++ b/sysdeps/x86_64/memrchr.S @@ -25,4 +25,5 @@ #include "isa-default-impl.h" +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) diff --git a/sysdeps/x86_64/multiarch/memrchr.c b/sysdeps/x86_64/multiarch/memrchr.c index f7db8b4..4902653 100644 --- a/sysdeps/x86_64/multiarch/memrchr.c +++ b/sysdeps/x86_64/multiarch/memrchr.c @@ -27,5 +27,6 @@ # include "ifunc-avx2.h" libc_ifunc_redirected (__redirect_memrchr, __memrchr, IFUNC_SELECTOR ()); +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) #endif -- cgit v1.1