00db10
From 6a69f5d33526bf8dafd65f3b53719402ce09d566 Mon Sep 17 00:00:00 2001
00db10
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
00db10
Date: Wed, 30 Jul 2014 05:31:40 -0500
00db10
Subject: [PATCH] PowerPC: multiarch memrchr for PowerPC64
00db10
00db10
commit 1fd005ad2f8ca30d44d5bfa036422b4ec281ea4a
00db10
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
00db10
Date:   Fri Dec 13 14:37:26 2013 -0500
00db10
00db10
Added sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c
00db10
apart from original commit
00db10
---
00db10
 .../powerpc32/power4/multiarch/memrchr-ppc32.c     | 25 ++++++++++++++
00db10
 sysdeps/powerpc/powerpc64/multiarch/Makefile       |  3 +-
00db10
 .../powerpc/powerpc64/multiarch/ifunc-impl-list.c  |  8 +++++
00db10
 .../powerpc/powerpc64/multiarch/memrchr-power7.S   | 40 ++++++++++++++++++++++
00db10
 .../powerpc/powerpc64/multiarch/memrchr-ppc64.c    | 19 ++++++++++
00db10
 sysdeps/powerpc/powerpc64/multiarch/memrchr.c      | 37 ++++++++++++++++++++
00db10
 6 files changed, 131 insertions(+), 1 deletion(-)
00db10
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
00db10
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memrchr.c
00db10
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c
00db10
new file mode 100644
00db10
index 0000000..c30e7d6
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c
00db10
@@ -0,0 +1,25 @@
00db10
+/* PowerPC32 default implementation of memrchr.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#ifndef NOT_IN_libc
00db10
+# define MEMRCHR  __memrchr_ppc
00db10
+# include <string.h>
00db10
+extern void *__memrchr_ppc (const void *, int, size_t);
00db10
+#endif
00db10
+
00db10
+#include <string/memrchr.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
00db10
index b2815e7..db765f2 100644
00db10
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
00db10
@@ -3,5 +3,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
00db10
                   memcpy-power4 memcpy-ppc64 memcmp-power7 memcmp-power4 \
00db10
                   memcmp-ppc64 memset-power7 memset-power6 memset-power4 \
00db10
                   memset-ppc64 bzero-power4 bzero-power6 bzero-power7 \
00db10
-                  mempcpy-power7 mempcpy-ppc64 memchr-power7 memchr-ppc64
00db10
+                  mempcpy-power7 mempcpy-ppc64 memchr-power7 memchr-ppc64 \
00db10
+                  memrchr-power7 memrchr-ppc64
00db10
 endif
00db10
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
00db10
index 663e294..a0700dc 100644
00db10
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
00db10
@@ -106,5 +106,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
00db10
              IFUNC_IMPL_ADD (array, i, memchr, 1,
00db10
                              __memchr_ppc))
00db10
 
00db10
+  /* Support sysdeps/powerpc/powerpc64/multiarch/memrchr.c.  */
00db10
+  IFUNC_IMPL (i, name, memrchr,
00db10
+             IFUNC_IMPL_ADD (array, i, memrchr,
00db10
+                             hwcap & PPC_FEATURE_HAS_VSX,
00db10
+                             __memrchr_power7)
00db10
+             IFUNC_IMPL_ADD (array, i, memrchr, 1,
00db10
+                             __memrchr_ppc))
00db10
+
00db10
   return i;
00db10
 }
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
00db10
new file mode 100644
00db10
index 0000000..42ee8e2
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S
00db10
@@ -0,0 +1,40 @@
00db10
+/* Optimized memrchr implementation for PowerPC64/POWER7.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <sysdep.h>
00db10
+
00db10
+#undef ENTRY
00db10
+#define ENTRY(name)						\
00db10
+  .section ".text";						\
00db10
+  ENTRY_2(__memrchr_power7)					\
00db10
+  .align ALIGNARG(2);						\
00db10
+  BODY_LABEL(__memrchr_power7):					\
00db10
+  cfi_startproc;
00db10
+
00db10
+#undef END
00db10
+#define END(name)						\
00db10
+  cfi_endproc;							\
00db10
+  TRACEBACK(__memrchr_power7)					\
00db10
+  END_2(__memrchr_power7)
00db10
+
00db10
+#undef libc_hidden_builtin_def
00db10
+#define libc_hidden_builtin_def(name)
00db10
+#undef weak_alias
00db10
+#define weak_alias(name,alias)
00db10
+
00db10
+#include <sysdeps/powerpc/powerpc64/power7/memrchr.S>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c
00db10
new file mode 100644
00db10
index 0000000..c2ee4be
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c
00db10
@@ -0,0 +1,19 @@
00db10
+/* PowerPC64 default implementation of memrchr.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr.c
00db10
new file mode 100644
00db10
index 0000000..610a957
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memrchr.c
00db10
@@ -0,0 +1,37 @@
00db10
+/* Multiple versions of memrchr.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#ifndef NOT_IN_libc
00db10
+# include <string.h>
00db10
+# include <shlib-compat.h>
00db10
+# include "init-arch.h"
00db10
+
00db10
+extern __typeof (__memrchr) __memrchr_ppc attribute_hidden;
00db10
+extern __typeof (__memrchr) __memrchr_power7 attribute_hidden;
00db10
+
00db10
+/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
00db10
+   ifunc symbol properly.  */
00db10
+libc_ifunc (__memrchr,
00db10
+	    (hwcap & PPC_FEATURE_HAS_VSX)
00db10
+            ? __memrchr_power7
00db10
+            : __memrchr_ppc);
00db10
+
00db10
+weak_alias (__memrchr, memrchr)
00db10
+#else
00db10
+#include <string/memrchr.c>
00db10
+#endif
00db10
-- 
00db10
1.8.3.1
00db10