5de29b
From 3cd86ba149cd650c338332dddb63e16f95041daf Mon Sep 17 00:00:00 2001
5de29b
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
5de29b
Date: Wed, 30 Jul 2014 05:10:37 -0500
5de29b
Subject: [PATCH] PowerPC: multiarch memset/bzero for PowerPC64
5de29b
5de29b
commit 8a29a3d00b5d8ce33fc291baecfd59d715190fd1
5de29b
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
5de29b
Date:   Fri Dec 13 14:33:16 2013 -0500
5de29b
5de29b
---
5de29b
 sysdeps/powerpc/powerpc64/memset.S                 |  2 +
5de29b
 sysdeps/powerpc/powerpc64/multiarch/Makefile       |  3 +-
5de29b
 sysdeps/powerpc/powerpc64/multiarch/bzero-power4.S | 26 ++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/bzero-power6.S | 26 ++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/bzero-power7.S | 26 ++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/bzero.c        | 40 ++++++++++++++++
5de29b
 .../powerpc/powerpc64/multiarch/ifunc-impl-list.c  | 20 ++++++++
5de29b
 .../powerpc/powerpc64/multiarch/memset-power4.S    | 40 ++++++++++++++++
5de29b
 .../powerpc/powerpc64/multiarch/memset-power6.S    | 40 ++++++++++++++++
5de29b
 .../powerpc/powerpc64/multiarch/memset-power7.S    | 40 ++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S | 55 ++++++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/memset.c       | 50 ++++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c  | 18 +++++++
5de29b
 sysdeps/powerpc/powerpc64/power4/memset.S          |  2 +
5de29b
 sysdeps/powerpc/powerpc64/power6/memset.S          |  2 +
5de29b
 sysdeps/powerpc/powerpc64/power7/memset.S          |  2 +
5de29b
 16 files changed, 391 insertions(+), 1 deletion(-)
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/bzero-power4.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/bzero-power6.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/bzero-power7.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/bzero.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/memset.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c
5de29b
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S
5de29b
index d02af98..fd5d4e5 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S
5de29b
@@ -265,6 +265,7 @@ L(medium_28t):
5de29b
 END_GEN_TB (BP_SYM (memset),TB_TOCLESS)
5de29b
 libc_hidden_builtin_def (memset)
5de29b
 
5de29b
+#ifndef NO_BZERO_IMPL
5de29b
 /* Copied from bzero.S to prevent the linker from inserting a stub
5de29b
    between bzero and memset.  */
5de29b
 ENTRY (BP_SYM (__bzero))
5de29b
@@ -284,3 +285,4 @@ ENTRY (BP_SYM (__bzero))
5de29b
 END_GEN_TB (BP_SYM (__bzero),TB_TOCLESS)
5de29b
 
5de29b
 weak_alias (BP_SYM (__bzero), BP_SYM (bzero))
5de29b
+#endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
5de29b
index c0bc520..424d2cd 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
5de29b
@@ -1,5 +1,6 @@
5de29b
 ifeq ($(subdir),string)
5de29b
 sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
5de29b
                   memcpy-power4 memcpy-ppc64 memcmp-power7 memcmp-power4 \
5de29b
-                  memcmp-ppc64
5de29b
+                  memcmp-ppc64 memset-power7 memset-power6 memset-power4 \
5de29b
+                  memset-ppc64 bzero-power4 bzero-power6 bzero-power7
5de29b
 endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power4.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power4.S
5de29b
new file mode 100644
5de29b
index 0000000..72b75ac
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power4.S
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* Optimized bzero implementation for PowerPC64/POWER4.
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
+ENTRY (__bzero_power4)
5de29b
+	CALL_MCOUNT 3
5de29b
+	mr	r5,r4
5de29b
+	li	r4,0
5de29b
+	b	__memset_power4
5de29b
+END_GEN_TB (__bzero_power4,TB_TOCLESS)
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power6.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power6.S
5de29b
new file mode 100644
5de29b
index 0000000..d0917c5
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power6.S
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* Optimized bzero implementation for PowerPC64/POWER6.
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
+ENTRY (__bzero_power6)
5de29b
+	CALL_MCOUNT 3
5de29b
+	mr	r5,r4
5de29b
+	li	r4,0
5de29b
+	b	__memset_power6
5de29b
+END_GEN_TB (__bzero_power6,TB_TOCLESS)
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power7.S
5de29b
new file mode 100644
5de29b
index 0000000..0ec285a
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero-power7.S
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* Optimized bzero 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
+ENTRY (__bzero_power7)
5de29b
+	CALL_MCOUNT 3
5de29b
+	mr	r5,r4
5de29b
+	li	r4,0
5de29b
+	b	__memset_power7
5de29b
+END_GEN_TB (__bzero_power7,TB_TOCLESS)
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero.c
5de29b
new file mode 100644
5de29b
index 0000000..ed83541
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/bzero.c
5de29b
@@ -0,0 +1,40 @@
5de29b
+/* Multiple versions of bzero. PowerPC64 version.
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
+/* Define multiple versions only for definition in libc.  */
5de29b
+#ifndef NOT_IN_libc
5de29b
+# include <string.h>
5de29b
+# include <strings.h>
5de29b
+# include "init-arch.h"
5de29b
+
5de29b
+extern __typeof (bzero) __bzero_ppc attribute_hidden;
5de29b
+extern __typeof (bzero) __bzero_power4 attribute_hidden;
5de29b
+extern __typeof (bzero) __bzero_power6 attribute_hidden;
5de29b
+extern __typeof (bzero) __bzero_power7 attribute_hidden;
5de29b
+
5de29b
+libc_ifunc (__bzero,
5de29b
+            (hwcap & PPC_FEATURE_HAS_VSX)
5de29b
+            ? __bzero_power7 :
5de29b
+	      (hwcap & PPC_FEATURE_ARCH_2_05)
5de29b
+		? __bzero_power6 :
5de29b
+		  (hwcap & PPC_FEATURE_POWER4)
5de29b
+		? __bzero_power4
5de29b
+            : __bzero_ppc);
5de29b
+
5de29b
+weak_alias (__bzero, bzero)
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 295ebca..11e7063 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
@@ -60,6 +60,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
5de29b
              IFUNC_IMPL_ADD (array, i, memcpy, hwcap & PPC_FEATURE_POWER4,
5de29b
                              __memcpy_power4)
5de29b
              IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_ppc))
5de29b
+
5de29b
+  /* Support sysdeps/powerpc/powerpc64/multiarch/memset.c.  */
5de29b
+  IFUNC_IMPL (i, name, memset,
5de29b
+             IFUNC_IMPL_ADD (array, i, memset, hwcap & PPC_FEATURE_HAS_VSX,
5de29b
+                             __memset_power7)
5de29b
+             IFUNC_IMPL_ADD (array, i, memset, hwcap & PPC_FEATURE_ARCH_2_05,
5de29b
+                             __memset_power6)
5de29b
+             IFUNC_IMPL_ADD (array, i, memset, hwcap & PPC_FEATURE_POWER4,
5de29b
+                             __memset_power4)
5de29b
+             IFUNC_IMPL_ADD (array, i, memset, 1, __memset_ppc))
5de29b
 #endif
5de29b
 
5de29b
   /* Support sysdeps/powerpc/powerpc64/multiarch/memcmp.c.  */
5de29b
@@ -70,5 +80,15 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
5de29b
                              __memcmp_power4)
5de29b
              IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_ppc))
5de29b
 
5de29b
+  /* Support sysdeps/powerpc/powerpc64/multiarch/bzero.c.  */
5de29b
+  IFUNC_IMPL (i, name, bzero,
5de29b
+             IFUNC_IMPL_ADD (array, i, bzero, hwcap & PPC_FEATURE_HAS_VSX,
5de29b
+                             __bzero_power7)
5de29b
+             IFUNC_IMPL_ADD (array, i, bzero, hwcap & PPC_FEATURE_ARCH_2_05,
5de29b
+                             __bzero_power6)
5de29b
+             IFUNC_IMPL_ADD (array, i, bzero, hwcap & PPC_FEATURE_POWER4,
5de29b
+                             __bzero_power4)
5de29b
+             IFUNC_IMPL_ADD (array, i, bzero, 1, __bzero_ppc))
5de29b
+
5de29b
   return i;
5de29b
 }
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
5de29b
new file mode 100644
5de29b
index 0000000..9074b95
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S
5de29b
@@ -0,0 +1,40 @@
5de29b
+/* Optimized memset implementation for PowerPC64/POWER4.
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 EALIGN
5de29b
+#define EALIGN(name, alignt, words)				\
5de29b
+  .section ".text";						\
5de29b
+  ENTRY_2(__memset_power4)					\
5de29b
+  .align ALIGNARG(alignt);					\
5de29b
+  EALIGN_W_##words;						\
5de29b
+  BODY_LABEL(__memset_power4):					\
5de29b
+  cfi_startproc;
5de29b
+
5de29b
+#undef END_GEN_TB
5de29b
+#define END_GEN_TB(name, mask)					\
5de29b
+  cfi_endproc;							\
5de29b
+  TRACEBACK_MASK(__memset_power4,mask)				\
5de29b
+  END_2(__memset_power4)
5de29b
+
5de29b
+#undef libc_hidden_builtin_def
5de29b
+#define libc_hidden_builtin_def(name)
5de29b
+
5de29b
+#define NO_BZERO_IMPL
5de29b
+#include <sysdeps/powerpc/powerpc64/power4/memset.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
5de29b
new file mode 100644
5de29b
index 0000000..70688b5
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S
5de29b
@@ -0,0 +1,40 @@
5de29b
+/* Optimized memset implementation for PowerPC64/POWER6.
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 EALIGN
5de29b
+#define EALIGN(name, alignt, words)				\
5de29b
+  .section ".text";						\
5de29b
+  ENTRY_2(__memset_power6)					\
5de29b
+  .align ALIGNARG(alignt);					\
5de29b
+  EALIGN_W_##words;						\
5de29b
+  BODY_LABEL(__memset_power6):					\
5de29b
+  cfi_startproc;
5de29b
+
5de29b
+#undef END_GEN_TB
5de29b
+#define END_GEN_TB(name, mask)					\
5de29b
+  cfi_endproc;							\
5de29b
+  TRACEBACK_MASK(__memset_power6,mask)				\
5de29b
+  END_2(__memset_power6)
5de29b
+
5de29b
+#undef libc_hidden_builtin_def
5de29b
+#define libc_hidden_builtin_def(name)
5de29b
+
5de29b
+#define NO_BZERO_IMPL
5de29b
+#include <sysdeps/powerpc/powerpc64/power6/memset.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
5de29b
new file mode 100644
5de29b
index 0000000..ab226c5
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S
5de29b
@@ -0,0 +1,40 @@
5de29b
+/* Optimized memset 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 EALIGN
5de29b
+#define EALIGN(name, alignt, words)				\
5de29b
+  .section ".text";						\
5de29b
+  ENTRY_2(__memset_power7)					\
5de29b
+  .align ALIGNARG(alignt);					\
5de29b
+  EALIGN_W_##words;						\
5de29b
+  BODY_LABEL(__memset_power7):					\
5de29b
+  cfi_startproc;
5de29b
+
5de29b
+#undef END_GEN_TB
5de29b
+#define END_GEN_TB(name, mask)					\
5de29b
+  cfi_endproc;							\
5de29b
+  TRACEBACK_MASK(__memset_power7,mask)				\
5de29b
+  END_2(__memset_power7)
5de29b
+
5de29b
+#undef libc_hidden_builtin_def
5de29b
+#define libc_hidden_builtin_def(name)
5de29b
+
5de29b
+#define NO_BZERO_IMPL
5de29b
+#include <sysdeps/powerpc/powerpc64/power7/memset.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
5de29b
new file mode 100644
5de29b
index 0000000..dc5549c
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
5de29b
@@ -0,0 +1,55 @@
5de29b
+/* Default memset/bzero implementation for PowerPC64.
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
+/* Copied from bzero.S to prevent the linker from inserting a stub
5de29b
+   between bzero and memset.  NOTE: this code should be positioned
5de29b
+   before ENTRY/END_GEN_TB redefinition.  */
5de29b
+ENTRY (__bzero_ppc)
5de29b
+        CALL_MCOUNT 3
5de29b
+        mr      r5,r4
5de29b
+        li      r4,0
5de29b
+        b       L(_memset)
5de29b
+END_GEN_TB (__bzero_ppc,TB_TOCLESS)
5de29b
+
5de29b
+
5de29b
+#if defined SHARED && !defined NOT_IN_libc
5de29b
+# undef EALIGN
5de29b
+# define EALIGN(name, alignt, words)				\
5de29b
+  .section ".text";						\
5de29b
+  ENTRY_2(__memset_ppc)						\
5de29b
+  .align ALIGNARG(alignt);					\
5de29b
+  EALIGN_W_##words;						\
5de29b
+  BODY_LABEL(__memset_ppc):					\
5de29b
+  cfi_startproc;
5de29b
+
5de29b
+# undef END_GEN_TB
5de29b
+# define END_GEN_TB(name, mask)					\
5de29b
+  cfi_endproc;							\
5de29b
+  TRACEBACK_MASK(__memset_ppc,mask)				\
5de29b
+  END_2(__memset_ppc)
5de29b
+
5de29b
+# undef libc_hidden_builtin_def
5de29b
+# define libc_hidden_builtin_def(name)
5de29b
+#endif
5de29b
+
5de29b
+/* Do not implement __bzero at powerpc64/memset.S.  */
5de29b
+#define NO_BZERO_IMPL
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/memset.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset.c
5de29b
new file mode 100644
5de29b
index 0000000..aa2ae70
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/memset.c
5de29b
@@ -0,0 +1,50 @@
5de29b
+/* Multiple versions of memset.
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
+/* Define multiple versions only for definition in libc.  */
5de29b
+#if defined SHARED && !defined NOT_IN_libc
5de29b
+/* Redefine memset so that the compiler won't complain about the type
5de29b
+   mismatch with the IFUNC selector in strong_alias, below.  */
5de29b
+# undef memset
5de29b
+# define memset __redirect_memset
5de29b
+# include <string.h>
5de29b
+# include <shlib-compat.h>
5de29b
+# include "init-arch.h"
5de29b
+
5de29b
+extern __typeof (__redirect_memset) __libc_memset;
5de29b
+
5de29b
+extern __typeof (__redirect_memset) __memset_ppc attribute_hidden;
5de29b
+extern __typeof (__redirect_memset) __memset_power4 attribute_hidden;
5de29b
+extern __typeof (__redirect_memset) __memset_power6 attribute_hidden;
5de29b
+extern __typeof (__redirect_memset) __memset_power7 attribute_hidden;
5de29b
+
5de29b
+/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
5de29b
+   ifunc symbol properly.  */
5de29b
+libc_ifunc (__libc_memset,
5de29b
+            (hwcap & PPC_FEATURE_HAS_VSX)
5de29b
+            ? __memset_power7 :
5de29b
+	      (hwcap & PPC_FEATURE_ARCH_2_05)
5de29b
+		? __memset_power6 :
5de29b
+		  (hwcap & PPC_FEATURE_POWER4)
5de29b
+		? __memset_power4
5de29b
+            : __memset_ppc);
5de29b
+
5de29b
+#undef memset
5de29b
+strong_alias (__libc_memset, memset);
5de29b
+libc_hidden_ver (__libc_memset, memset);
5de29b
+#endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c
5de29b
new file mode 100644
5de29b
index 0000000..8eac85b
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c
5de29b
@@ -0,0 +1,18 @@
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/powerpc64/rtld-memset.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S
5de29b
index c86a68a..c077ae7 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S
5de29b
@@ -253,6 +253,7 @@ L(medium_28t):
5de29b
 END_GEN_TB (BP_SYM (memset),TB_TOCLESS)
5de29b
 libc_hidden_builtin_def (memset)
5de29b
 
5de29b
+#ifndef NO_BZERO_IMPL
5de29b
 /* Copied from bzero.S to prevent the linker from inserting a stub
5de29b
    between bzero and memset.  */
5de29b
 ENTRY (BP_SYM (__bzero))
5de29b
@@ -272,3 +273,4 @@ ENTRY (BP_SYM (__bzero))
5de29b
 END_GEN_TB (BP_SYM (__bzero),TB_TOCLESS)
5de29b
 
5de29b
 weak_alias (BP_SYM (__bzero), BP_SYM (bzero))
5de29b
+#endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S
5de29b
index 930ecce..967642a3 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S
5de29b
@@ -397,6 +397,7 @@ L(medium_28t):
5de29b
 END_GEN_TB (BP_SYM (memset),TB_TOCLESS)
5de29b
 libc_hidden_builtin_def (memset)
5de29b
 
5de29b
+#ifndef NO_BZERO_IMPL
5de29b
 /* Copied from bzero.S to prevent the linker from inserting a stub
5de29b
    between bzero and memset.  */
5de29b
 ENTRY (BP_SYM (__bzero))
5de29b
@@ -416,3 +417,4 @@ ENTRY (BP_SYM (__bzero))
5de29b
 END_GEN_TB (BP_SYM (__bzero),TB_TOCLESS)
5de29b
 
5de29b
 weak_alias (BP_SYM (__bzero), BP_SYM (bzero))
5de29b
+#endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S
5de29b
index 5970fbe..2716656 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S
5de29b
@@ -385,6 +385,7 @@ L(small):
5de29b
 END_GEN_TB (BP_SYM (memset),TB_TOCLESS)
5de29b
 libc_hidden_builtin_def (memset)
5de29b
 
5de29b
+#ifndef NO_BZERO_IMPL
5de29b
 /* Copied from bzero.S to prevent the linker from inserting a stub
5de29b
    between bzero and memset.  */
5de29b
 ENTRY (BP_SYM (__bzero))
5de29b
@@ -395,3 +396,4 @@ ENTRY (BP_SYM (__bzero))
5de29b
 END_GEN_TB (BP_SYM (__bzero),TB_TOCLESS)
5de29b
 
5de29b
 weak_alias (BP_SYM (__bzero), BP_SYM (bzero))
5de29b
+#endif
5de29b
-- 
5de29b
1.8.3.1
5de29b