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 <carlos.seo@linaro.org>

diff --git a/include/string.h b/include/string.h
index 6e364e8a67617a860ca6169b65acd1c7871c42b9..a9120ff37c6d851564c7fe5b6cf4328269300606 100644 (file)
--- 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 b37f2a68c89b15112feb0ca140cf41b508c2c845..3de5ec691c89880ec6eeb8ad2517f04532534408 100644 (file)
--- 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 621fc65109736646b74900db8d15c6f8a7c68895..af7d847dabfc82d1e061c2743931ee7c6edeeb48 100644 (file)
--- 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 c2c37f7ce1f387aab64b179eb8cd9733f97e0f16..aa15e7cf243be3303dd2847163b75e4789dce362 100644 (file)
--- 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 c820a9d607e93d2900f1f9b83f5095d4c23f9f39..80dca18000ace049e37b98c43efa58e96a74c8f8 100644 (file)
--- 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 <string.h>
 # 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 62e7a1298994224ee2debf6368c810ffb8ccd5a8..038c5f4532b55cbb0b1ac811e0e6d9a37c7e32c1 100644 (file)
--- 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 <string/memrchr.c>
+# 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 8c1385fe6a9d76ab4f87cd5fa8d8425dbf082f59..fb0d2c0617b3e3f76e6f30e3e53131736e950def 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c
@@ -17,21 +17,21 @@
    <https://www.gnu.org/licenses/>.  */
 
 #if IS_IN (libc)
+# define memrchr __redirect_memrchr
 # include <string.h>
 # include <shlib-compat.h>
 # 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 <string/memrchr.c>
 #endif

diff --git a/sysdeps/powerpc/powerpc32/power7/memrchr.S b/sysdeps/powerpc/powerpc32/power7/memrchr.S
index 9c70517d37f131b657c729819c6cf78373b90c4f..9f0f17fa46dd80caaf318b7fe3cd8c0db45e10ea 100644 (file)
--- 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 59527a83eb862d59cbc621e1e3328926db222521..5e7c00fdce5544c533632153734c449a97555f60 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c
@@ -17,6 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #if IS_IN (libc)
+# define memrchr __redirect_memrchr
 # include <string.h>
 # include <shlib-compat.h>
 # 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 <string/memrchr.c>
 #endif

diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64/power7/memrchr.S
index 56e79f3cd5c9139daddc8d00343d8049f47338e4..3b0430ccff76f71923b1ed2a69cc87047135cf6a 100644 (file)
--- 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 fec76cf586ebe340ee6be927829ed39f935cc4f2..ebe40179685b495a317660e31d0cbdbc109c074b 100644 (file)
--- 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 ce97bc67149aaa28ee0d36394311bf1d45cf2a0a..bdf3c7bbe0a376485912ced41713f3321a612b5e 100644 (file)
--- a/sysdeps/s390/memrchr-c.c
+++ b/sysdeps/s390/memrchr-c.c
@@ -24,4 +24,8 @@
 # endif
 
 # include <string/memrchr.c>
+
+# 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 73e75628c1720c5a541bdd9bba928abd1510478a..405990faef0dad717f2423d6d55fa127131e88e7 100644 (file)
--- a/sysdeps/s390/memrchr.c
+++ b/sysdeps/s390/memrchr.c
@@ -19,18 +19,20 @@
 #include <ifunc-memrchr.h>
 
 #if HAVE_MEMRCHR_IFUNC
+# define __memrchr __redirect_memrchr
 # include <string.h>
+# undef __memrchr
 # include <ifunc-resolve.h>
 
 # 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 fe33998111c6607b45c2f507ed343fb3336ab548..98a220f3f465b235d6d3d865e82e401f2409948c 100644 (file)
--- 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 f7db8b470828f4b4c9ca93c0af3d5a954b14fe4d..49026538d40cd2732d4d049e0af5442be743a541 100644 (file)
--- 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