From 6bd4d02ee997f5b073583c5d8638ffdefedb13bc Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 27 Feb 2019 15:56:58 -0300 Subject: powerpc: Fix linknamespace introduced by 4d8015639a75 This patch fixes the linknamespace issues add on wcscpy refactor for powerpc-linux-gnu-power4 as shown by the tests: FAIL: conform/POSIX/fnmatch.h/linknamespace FAIL: conform/POSIX/glob.h/linknamespace FAIL: conform/POSIX/wordexp.h/linknamespace FAIL: conform/XPG4/fnmatch.h/linknamespace FAIL: conform/XPG4/glob.h/linknamespace FAIL: conform/XPG4/wordexp.h/linknamespace FAIL: conform/XPG42/fnmatch.h/linknamespace FAIL: conform/XPG42/glob.h/linknamespace FAIL: conform/XPG42/wordexp.h/linknamespace [initial] wordexp -> [libc.a(wordexp.o)] fnmatch -> [libc.a(fnmatch.o)] __wcscat -> [libc.a(wcscat.o)] __wcscpy -> [libc.a(wcscpy.o)] wcscpy Checked on powerpc-linux-gnu-power4. * sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: Define ifunc symbol as __wcspcy instead of wcscpy. --- sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c index e87984669e..0daf55cf70 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c @@ -17,20 +17,20 @@ . */ #if IS_IN (libc) -# define wcscpy __redirect_wcscpy +# define __wcscpy __redirect_wcscpy # include -# undef wcscpy +# undef __wcscpy # include "init-arch.h" extern __typeof (__redirect_wcscpy) __wcscpy_ppc attribute_hidden; extern __typeof (__redirect_wcscpy) __wcscpy_power6 attribute_hidden; extern __typeof (__redirect_wcscpy) __wcscpy_power7 attribute_hidden; -libc_ifunc_redirected (__redirect_wcscpy, wcscpy, +libc_ifunc_redirected (__redirect_wcscpy, __wcscpy, (hwcap & PPC_FEATURE_HAS_VSX) ? __wcscpy_power7 : (hwcap & PPC_FEATURE_ARCH_2_05) ? __wcscpy_power6 : __wcscpy_ppc); -weak_alias (wcscpy, __wcscpy) +weak_alias (__wcscpy, wcscpy) #endif -- cgit 1.4.1