PowerPC: Fix optimized strncat strlen call

This patch fixes the optimized ppc64/power7 strncat strlen call for
static build without ifunc enabled.  The strlen symbol to call in such
situation is just strlen, instead of __GI_strlen (since the __GI_
alias is just created for shared objects).

It is a backport of ed36bfa18faf9be457575568e64b8409e46caa22.

diff --git a/ChangeLog b/ChangeLog
index 2b48b1f12d91083c44fb1754ad93e4dea96f833c..d7fd998784fff98b9a612018e198f2ddc66905da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-06  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
+       * sysdeps/powerpc/powerpc64/power7/strncat.S [STRLEN]: Define it as
+       strlen for non SHARED builds.
+
        * sysdeps/powerpc/powerpc32/power6x/fpu/Implies: New file.
        * sysdeps/powerpc/powerpc64/power6x/fpu/Implies: new file.
        * sysdeps/powerpc/powerpc64/power6x/multiarch/Implies: New file.

diff --git a/sysdeps/powerpc/powerpc64/power7/strncat.S b/sysdeps/powerpc/powerpc64/power7/strncat.S
index e7e36a4de491dd97a79cc4f6e9b4a8da05d5fc19..f5ea52d3d43ded51ecc6cf803ed31ad788a1e9e1 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power7/strncat.S
+++ b/sysdeps/powerpc/powerpc64/power7/strncat.S
@@ -40,7 +40,11 @@
 #ifndef STRLEN
 /* For builds with no IFUNC support, local calls should be made to internal
    GLIBC symbol (created by libc_hidden_builtin_def).  */
-# define STRLEN   __GI_strlen
+# ifdef SHARED
+#  define STRLEN   __GI_strlen
+# else
+#  define STRLEN   strlen
+# endif
 #endif
 
 #define        FRAMESIZE       (FRAME_MIN_SIZE+32)