From 5fededd8251b9f5ccd7f893123417205447b95f1 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 22 May 2024 11:32:04 -0300 Subject: [PATCH] powerpc: Remove duplicate strchrnul and strncasecmp_l libc.a (BZ 31786) For powerpc64 the generic version provides a weak definition of strchrnul, which are already provided by the ifunc resolver. The powerpc32 version is slight different, where for static case there is no iFUNC support. The strncasecmp_l is provided ifunc resolver. Checked on powerpc-linux-gnu-power4 and powerpc64-linux-gnu. Reviewed-by: H.J. Lu --- sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S | 3 +++ sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c | 14 +++++++++++++- sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S index 384edce8b9..fc784c2856 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S +++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S @@ -18,6 +18,9 @@ #define STRCHRNUL __strchrnul_power7 +#undef weak_alias +#define weak_alias(a,b) + #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c index 8e42504efe..7127972250 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c @@ -16,4 +16,16 @@ License along with the GNU C Library; if not, see . */ -#include +#include + +#if IS_IN (libc) +# define STRCHRNUL __strchrnul_ppc +extern __typeof (strchrnul) __strchrnul_ppc attribute_hidden; + +# include +# undef __strchrnul +weak_alias (__strchrnul_ppc, __strchrnul) +# ifdef SHARED +__hidden_ver1 (__strchrnul_ppc, __GI___strchrnul, __strchrnul_ppc); +# endif +#endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c b/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c index 1587079580..664ce44345 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c @@ -19,6 +19,9 @@ #define __strncasecmp_l __strncasecmp_l_power7 +#undef weak_alias +#define weak_alias(a,b) + #undef libc_hidden_def #define libc_hidden_def(name) -- 2.11.4.GIT