From 22999b2f0fb62eed1af4095d062bd1272d6afeb1 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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 <carlos.seo@linaro.org>
---
 sysdeps/s390/memrchr-c.c | 4 ++++
 sysdeps/s390/memrchr.c   | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'sysdeps/s390')

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 <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 73e7562..405990f 100644
--- 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
-- 
cgit v1.1