aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-02-27 15:56:58 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-02-27 15:56:58 -0300
commit6bd4d02ee997f5b073583c5d8638ffdefedb13bc (patch)
treee5db7ecd73f30b009bf9a16d11e02ecf79e5b52a
parent1b2184177553ce4ef8458034927ef50854be2af6 (diff)
downloadglibc-6bd4d02ee997f5b073583c5d8638ffdefedb13bc.zip
glibc-6bd4d02ee997f5b073583c5d8638ffdefedb13bc.tar.gz
glibc-6bd4d02ee997f5b073583c5d8638ffdefedb13bc.tar.bz2
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.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index efe62c1..902ae1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-27 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: Define ifunc
+ symbol as __wcspcy instead of wcscpy.
+
2019-02-27 Samuel Thibault <samuel.thibault@ens-lyon.org>
* include/stdio.h (__renameat2): New hidden prototype.
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c
index e879846..0daf55c 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c
@@ -17,20 +17,20 @@
<http://www.gnu.org/licenses/>. */
#if IS_IN (libc)
-# define wcscpy __redirect_wcscpy
+# define __wcscpy __redirect_wcscpy
# include <wchar.h>
-# 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