From: Adhemerval Zanella Date: Fri, 6 Jun 2014 14:37:07 +0000 (-0500) Subject: PowerPC: Fix optimized strncat strlen call X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=010c023685495f4cd907b7bf7d15375edcbe1ead;p=thirdparty%2Fglibc.git 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 2b48b1f12d9..d7fd998784f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-06-06 Adhemerval Zanella + * 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 e7e36a4de49..f5ea52d3d43 100644 --- 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)