powerpc: make memchr use memchr-power7.

In powerpc64, memchr was always pointing to the internal __GI_memchr
implementation.  This patch fixes that and makes it use the
optimized POWER7 version when adequate.

	* sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c: Make
	memchr not point to the internal __GI_memchr implementation.

diff --git a/ChangeLog b/ChangeLog
index c5e70b17ba4d6e46382400578f5c3cc091c8865f..20d5255280553af4f9604d0d4598b178755b7a92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-21  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
+
+       * sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c: Make
+       memchr not point to the internal __GI_memchr implementation.
+
 2015-08-20  Joseph Myers  <joseph@codesourcery.com>
 
        * timezone/Makefile (CFLAGS-zdump.c): Remove

diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c
index eadfea16542b8ec7db3c878c885bc8a24c1e2a1f..302d1bb83d65916af188db5a79abd5796270dea9 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c
@@ -16,4 +16,16 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c>
+#include <string.h>
+
+#define MEMCHR  __memchr_ppc
+
+#undef weak_alias
+#define weak_alias(a, b)
+
+# undef libc_hidden_builtin_def
+# define libc_hidden_builtin_def(name)
+
+extern __typeof (memchr) __memchr_ppc attribute_hidden;
+
+#include <string/memchr.c>