AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-11 03:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

PowerPC: Fix bzero definition for static libc for PPC64

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella 2014-03-10 15:26:20 -05:00
parent e65caf1f1d
commit 4facea4730
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-03-11 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
[BZ #16683]
* sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S (__bzero_ppc):
Define it for static builds as well.
(NO_BZERO_IMPL): Likewise.
2014-03-11 Vidya Ranganathan <vidya@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/power7/strspn.S: New file: Optimization.

2
NEWS
View File

@ -10,7 +10,7 @@ Version 2.20
* The following bugs are resolved with this release:
15347, 15804, 15894, 16447, 16532, 16545, 16574, 16600, 16609, 16610,
16611, 16613, 16623, 16632, 16639, 16670, 16674.
16611, 16613, 16623, 16632, 16639, 16670, 16674, 16683.
* The am33 port, which had not worked for several years, has been removed
from ports.

13
sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
View File

@ -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
/* Do not implement __bzero at powerpc64/memset.S. */
# define NO_BZERO_IMPL
#endif
/* Do not implement __bzero at powerpc64/memset.S. */
#define NO_BZERO_IMPL
#include <sysdeps/powerpc/powerpc64/memset.S>