diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-03-10 15:26:20 -0500 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-03-11 09:31:59 -0500 |
| commit | 4facea473059914983b7da8dd654c06b8e3dcc41 (patch) | |
| tree | 520c9f3e14f1a1ad5d036b1561d6a02c29567982 /sysdeps/powerpc/powerpc64/multiarch | |
| parent | e65caf1f1df4ecc122da3d30689ee2e8e2bd354f (diff) | |
| download | glibc-4facea473059914983b7da8dd654c06b8e3dcc41.tar.gz glibc-4facea473059914983b7da8dd654c06b8e3dcc41.tar.xz glibc-4facea473059914983b7da8dd654c06b8e3dcc41.zip | |
PowerPC: Fix bzero definition for static libc for PPC64
This patch fixes an issue for powerpc64[le] static build where __bzero is definied in multiple places (memset-ppc64.o and bzero.o). It is now defined only in bzero.o and memset-ppc64.o only defined __bzero_ppc for both dynamic and static library. Fixes BZ#16683.
Diffstat (limited to 'sysdeps/powerpc/powerpc64/multiarch')
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S index 5b234d9ecb..65b3afe250 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S @@ -18,10 +18,9 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc - /* Copied from bzero.S to prevent the linker from inserting a stub - between bzero and memset. */ + between bzero and memset. NOTE: this code should be positioned + before ENTRY/END_GEN_TB redefinition. */ ENTRY (__bzero_ppc) CALL_MCOUNT 3 mr r5,r4 @@ -29,6 +28,8 @@ ENTRY (__bzero_ppc) b L(_memset) END_GEN_TB (__bzero_ppc,TB_TOCLESS) + +#if defined SHARED && !defined NOT_IN_libc # undef EALIGN # define EALIGN(name, alignt, words) \ .section ".text"; \ @@ -48,9 +49,9 @@ END_GEN_TB (__bzero_ppc,TB_TOCLESS) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ .globl __GI_memset; __GI_memset = __memset_ppc +#endif /* Do not implement __bzero at powerpc64/memset.S. */ -# define NO_BZERO_IMPL -#endif +#define NO_BZERO_IMPL #include <sysdeps/powerpc/powerpc64/memset.S> |