From 6f714aa4ad5af2745ae2d185821d20ce8fabc2c5 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 31 Jul 2015 10:48:20 -0300 Subject: 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. --- sysdeps/powerpc/powerpc64/power7/strstr.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sysdeps/powerpc/powerpc64/power7/strstr.S') 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 -- cgit 1.4.1