mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 18:23:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc: Fix PPC64/POWER7 conform tests

Browse Source 
When building with --disable-multi-arch the memmove and strstr POWER7
optimization create and uses symbols that conflict with expect conform
tests.

	* sysdeps/powerpc/powerpc64/power7/memmove.S (bcopy): Changing to
	__bcopy and add a weak_alias to bcopy.
	* sysdeps/powerpc/powerpc64/power7/strstr.S (strstr): Use __strnlen
	for static build.
This commit is contained in:
Adhemerval Zanella 2015-07-31 10:48:20 -03:00 committed by Adhemerval Zanella
parent 142e0a9953
commit 6f714aa4ad
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2015-08-10 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/powerpc/powerpc64/power7/memmove.S (bcopy): Changing to
__bcopy and add a weak_alias to bcopy.
* sysdeps/powerpc/powerpc64/power7/strstr.S (strstr): Use __strnlen
for static build.
* string/stpcpy.c (__stpcpy): Use STPCPY to redefine symbol name and
cleanup macro usage.
* string/strcpy.c (strcpt): Use STRCPY to redefine symbol name.

5
sysdeps/powerpc/powerpc64/power7/memmove.S
View File

@ -823,9 +823,10 @@ libc_hidden_builtin_def (memmove)
/* void bcopy(const void *src [r3], void *dest [r4], size_t n [r5])
Implemented in this file to avoid linker create a stub function call
in the branch to '_memmove'. */
ENTRY (bcopy)
ENTRY (__bcopy)
mr r6,r3
mr r3,r4
mr r4,r6
b L(_memmove)
END (bcopy)
END (__bcopy)
weak_alias (__bcopy, bcopy)

2
sysdeps/powerpc/powerpc64/power7/strstr.S
View File

@ -39,7 +39,7 @@
# ifdef SHARED
# define STRNLEN __GI_strnlen
# else
# define STRNLEN strnlen
# define STRNLEN __strnlen
# endif
#endif