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.

diff --git a/ChangeLog b/ChangeLog
index 9e5db832149edd9042fdd588e0a877c722a50671..4a7f5a4781064bb728d7a76d863e5594a6d62d3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/sysdeps/powerpc/powerpc64/power7/memmove.S b/sysdeps/powerpc/powerpc64/power7/memmove.S
index 3bd4b4bb3fc86b86a37410523a37013c5501d960..43f0a48cc846e4aa0f7f58a8ae70e757d934f915 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power7/memmove.S
+++ b/sysdeps/powerpc/powerpc64/power7/memmove.S
@@ -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)

diff --git a/sysdeps/powerpc/powerpc64/power7/strstr.S b/sysdeps/powerpc/powerpc64/power7/strstr.S
index 8dca31ce3515839f6b172dba68896b5f943590b3..bfb0c4992a82bec4cc274468dc85eb81c5cf58e3 100644 (file)
--- 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