This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.24-429-g8072373
- From: azanella at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Nov 2016 17:14:11 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-429-g8072373
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 8072373ea96cb95a0d1cbe97a41a352439b92ea9 (commit)
from b04beebf0731c0da49bf9113bf299acf56e4c2e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8072373ea96cb95a0d1cbe97a41a352439b92ea9
commit 8072373ea96cb95a0d1cbe97a41a352439b92ea9
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Nov 30 11:31:41 2016 -0200
powerpc: Remove stpcpy internal clash with IFUNC
Commit 142e0a99530 redirected the internal stpcpy to default powerpc64
implementation by redefining the weak_alias at
sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c:
#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.
diff --git a/ChangeLog b/ChangeLog
index 09c2e52..e6e48e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-30 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c (weak_alias):
+ Remove redirection to __stpcpy_ppc.
+
2016-11-30 Florian Weimer <fweimer@redhat.com>
Remove __libc_memalign from ld.so because it is unused.
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)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources