5de29b
From a8d62012e2b47e8f62fafe17ab1042b0415a06ea Mon Sep 17 00:00:00 2001
5de29b
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
5de29b
Date: Wed, 30 Jul 2014 05:20:37 -0500
5de29b
Subject: [PATCH] PowerPC: multiarch memchr for PowerPC64
5de29b
5de29b
commit 870f867648fc62e230dad80cd34bd599f08e2193
5de29b
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
5de29b
Date:   Fri Dec 13 14:35:28 2013 -0500
5de29b
5de29b
Added string/memchr.c and
5de29b
sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c aart from
5de29b
original commit
5de29b
---
5de29b
 string/memchr.c                                    |  6 +++-
5de29b
 .../powerpc32/power4/multiarch/memchr-ppc32.c      | 34 ++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/Makefile       |  2 +-
5de29b
 .../powerpc/powerpc64/multiarch/ifunc-impl-list.c  |  8 +++++
5de29b
 .../powerpc/powerpc64/multiarch/memchr-power7.S    | 40 ++++++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c | 19 ++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/memchr.c       | 38 ++++++++++++++++++++
5de29b
 7 files changed, 145 insertions(+), 2 deletions(-)
5de29b
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memchr.c
5de29b
12745e
diff --git glibc-2.17-c758a686/string/memchr.c glibc-2.17-c758a686/string/memchr.c
5de29b
index 22637cf..822c0a4 100644
12745e
--- glibc-2.17-c758a686/string/memchr.c
12745e
+++ glibc-2.17-c758a686/string/memchr.c
5de29b
@@ -56,9 +56,13 @@
5de29b
 #undef memchr
5de29b
 #undef __memchr
5de29b
 
5de29b
+#ifndef MEMCHR
5de29b
+# define MEMCHR __memchr
5de29b
+#endif
5de29b
+
5de29b
 /* Search no more than N bytes of S for C.  */
5de29b
 __ptr_t
5de29b
-__memchr (s, c_in, n)
5de29b
+MEMCHR (s, c_in, n)
5de29b
      const __ptr_t s;
5de29b
      int c_in;
5de29b
      size_t n;
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c
5de29b
new file mode 100644
5de29b
index 0000000..43c5652
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c
5de29b
@@ -0,0 +1,34 @@
5de29b
+/* PowerPC32 default implementation of memchr.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#include <string.h>
5de29b
+
5de29b
+#define MEMCHR  __memchr_ppc
5de29b
+
5de29b
+#undef weak_alias
5de29b
+#define weak_alias(a, b)
5de29b
+
5de29b
+#ifdef SHARED
5de29b
+# undef libc_hidden_builtin_def
5de29b
+# define libc_hidden_builtin_def(name)  \
5de29b
+  __hidden_ver1 (__memchr_ppc, __GI_memchr, __memchr_ppc);
5de29b
+#endif
5de29b
+
5de29b
+extern __typeof (memchr) __memchr_ppc attribute_hidden;
5de29b
+
5de29b
+#include <string/memchr.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
5de29b
index 22560e8..b2815e7 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
5de29b
@@ -3,5 +3,5 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
5de29b
                   memcpy-power4 memcpy-ppc64 memcmp-power7 memcmp-power4 \
5de29b
                   memcmp-ppc64 memset-power7 memset-power6 memset-power4 \
5de29b
                   memset-ppc64 bzero-power4 bzero-power6 bzero-power7 \
5de29b
-                  mempcpy-power7 mempcpy-ppc64
5de29b
+                  mempcpy-power7 mempcpy-ppc64 memchr-power7 memchr-ppc64
5de29b
 endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
5de29b
index c72c229..663e294 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
5de29b
@@ -98,5 +98,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
5de29b
              IFUNC_IMPL_ADD (array, i, mempcpy, 1,
5de29b
                              __mempcpy_ppc))
5de29b
 
5de29b
+  /* Support sysdeps/powerpc/powerpc64/multiarch/memchr.c.  */
5de29b
+  IFUNC_IMPL (i, name, memchr,
5de29b
+             IFUNC_IMPL_ADD (array, i, memchr,
5de29b
+                             hwcap & PPC_FEATURE_HAS_VSX,
5de29b
+                             __memchr_power7)
5de29b
+             IFUNC_IMPL_ADD (array, i, memchr, 1,
5de29b
+                             __memchr_ppc))
5de29b
+
5de29b
   return i;
5de29b
 }
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
5de29b
new file mode 100644
5de29b
index 0000000..b1b4ec7
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S
5de29b
@@ -0,0 +1,40 @@
5de29b
+/* Optimized memchr implementation for PowerPC64/POWER7.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#include <sysdep.h>
5de29b
+
5de29b
+#undef ENTRY
5de29b
+#define ENTRY(name)						\
5de29b
+  .section ".text";						\
5de29b
+  ENTRY_2(__memchr_power7)					\
5de29b
+  .align ALIGNARG(2);						\
5de29b
+  BODY_LABEL(__memchr_power7):					\
5de29b
+  cfi_startproc;
5de29b
+
5de29b
+#undef END
5de29b
+#define END(name)						\
5de29b
+  cfi_endproc;							\
5de29b
+  TRACEBACK(__memchr_power7)					\
5de29b
+  END_2(__memchr_power7)
5de29b
+
5de29b
+#undef libc_hidden_builtin_def
5de29b
+#define libc_hidden_builtin_def(name)
5de29b
+#undef weak_alias
5de29b
+#define weak_alias(name,alias)
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/power7/memchr.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c
5de29b
new file mode 100644
5de29b
index 0000000..9e2a711
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c
5de29b
@@ -0,0 +1,19 @@
5de29b
+/* PowerPC64 default implementation of memchr.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr.c
5de29b
new file mode 100644
5de29b
index 0000000..ca0f714
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memchr.c
5de29b
@@ -0,0 +1,38 @@
5de29b
+/* Multiple versions of memchr.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#ifndef NOT_IN_libc
5de29b
+# include <string.h>
5de29b
+# include <shlib-compat.h>
5de29b
+# include "init-arch.h"
5de29b
+
5de29b
+extern __typeof (__memchr) __memchr_ppc attribute_hidden;
5de29b
+extern __typeof (__memchr) __memchr_power7 attribute_hidden;
5de29b
+
5de29b
+/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
5de29b
+   ifunc symbol properly.  */
5de29b
+libc_ifunc (__memchr,
5de29b
+	    (hwcap & PPC_FEATURE_HAS_VSX)
5de29b
+            ? __memchr_power7
5de29b
+            : __memchr_ppc);
5de29b
+
5de29b
+weak_alias (__memchr, memchr)
5de29b
+libc_hidden_builtin_def (memchr)
5de29b
+#else
5de29b
+#include <string/memchr.c>
5de29b
+#endif
5de29b
-- 
5de29b
1.8.3.1
5de29b