[COMMITTED] powerpc: Remove stpcpy internal clash with IFUNC

Message ID 1480526069-23879-1-git-send-email-adhemerval.zanella@linaro.org
State New
Headers show

Commit Message

Adhemerval Zanella Nov. 30, 2016, 5:14 p.m.
Commit 142e0a99530 redirected the internal stpcpy to default powerpc64
implementation by redefining the weak_alias at

  #undef weak_alias
  #define weak_alias(name, aliasname) \
    extern __typeof (__stpcpy_ppc) aliasname \
      __attribute__ ((weak, alias ("__stpcpy_ppc")));

This creates a __GI_stpcpy alias that clashes with the IFUNC symbol in
stpcpy.os.  There is not need to define the default version for internal
version, since ifunc should work internally for powerpc64.  This patch
removes the weak_alias indirection.

Checked on powerpc64le.

	* sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c (weak_alias):
	Remove redirection to __stpcpy_ppc.
 ChangeLog                                          | 5 +++++
 sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)



diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c
index d607d8a..37a2325 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c
@@ -27,9 +27,7 @@  extern __typeof (stpcpy) __stpcpy_ppc attribute_hidden;
 #define strlen __strlen_ppc
 #undef weak_alias
-#define weak_alias(name, aliasname) \
-  extern __typeof (__stpcpy_ppc) aliasname \
-    __attribute__ ((weak, alias ("__stpcpy_ppc")));
+#define weak_alias(name, aliasname)
 #undef libc_hidden_def
 #define libc_hidden_def(name)