diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2015-07-31 10:48:20 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.com> | 2015-08-11 10:03:10 -0300 |
commit | 6f714aa4ad5af2745ae2d185821d20ce8fabc2c5 (patch) | |
tree | 0a268381da4409c430da9ce4f7257e0cbd4f444b /sysdeps/powerpc/powerpc64/power7/strstr.S | |
parent | 142e0a9953059bcf5667921f2670efec377be3d5 (diff) | |
download | glibc-6f714aa4ad5af2745ae2d185821d20ce8fabc2c5.tar glibc-6f714aa4ad5af2745ae2d185821d20ce8fabc2c5.tar.gz glibc-6f714aa4ad5af2745ae2d185821d20ce8fabc2c5.tar.bz2 glibc-6f714aa4ad5af2745ae2d185821d20ce8fabc2c5.zip |
powerpc: Fix PPC64/POWER7 conform tests
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.
Diffstat (limited to 'sysdeps/powerpc/powerpc64/power7/strstr.S')
-rw-r--r-- | sysdeps/powerpc/powerpc64/power7/strstr.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/powerpc/powerpc64/power7/strstr.S b/sysdeps/powerpc/powerpc64/power7/strstr.S index 8dca31ce35..bfb0c4992a 100644 --- a/sysdeps/powerpc/powerpc64/power7/strstr.S +++ b/sysdeps/powerpc/powerpc64/power7/strstr.S @@ -39,7 +39,7 @@ # ifdef SHARED # define STRNLEN __GI_strnlen # else -# define STRNLEN strnlen +# define STRNLEN __strnlen # endif #endif |