system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Remove stpcpy internal clash with IFUNC

Browse Source 
Commit c7debbdfacb redirected the internal strrch to default powerpc64
implementation by redefining the weak_alias at
sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.c:

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

This creates a __GI_strchr alias that clashes with the IFUNC symbol in
stprchr.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/strrchr-ppc64.c (weak_alias):
	Remove redirection to __strrchr_ppc.
This commit is contained in:
Adhemerval Zanella 2016-12-01 15:53:16 -02:00
parent 80ab6401a9
commit 5cd94e67d0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2016-12-01 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c (weak_alias):
Remove redirection to __strrchr_ppc.
2016-12-01 Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com> 2016-12-01 Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/Makefile * sysdeps/powerpc/powerpc64/multiarch/Makefile

6
sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c
View File

@ -18,10 +18,10 @@
#include <string.h> #include <string.h>
#define STRRCHR __strrchr_ppc #define STRRCHR __strrchr_ppc
#undef weak_alias #undef weak_alias
#define weak_alias(name, aliasname) \ #define weak_alias(name, aliasname)
extern __typeof (__strrchr_ppc) aliasname \
__attribute__ ((weak, alias ("__strrchr_ppc")));
#if IS_IN (libc) && defined(SHARED) #if IS_IN (libc) && defined(SHARED)
# undef libc_hidden_builtin_def # undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \ # define libc_hidden_builtin_def(name) \