PowerPC: wcscpy ifunc for PowerPC32

7 files changed, 74 insertions, 4 deletions

diff --git a/sysdeps/powerpc/powerpc32/multiarch/Makefile b/sysdeps/powerpc/powerpc32/multiarch/Makefile
index 19b11e1103..23be40709d 100644
--- a/sysdeps/powerpc/powerpc32/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc32/multiarch/Makefile
@@ -14,5 +14,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
 		   wordcopy-power7 wordcopy-power6 wordcopy-power5 \
 		   wordcopy-power4 wordcopy-c \
 		   wcschr-power7 wcschr-power6 wcschr-c \
-		   wcsrchr-power7 wcsrchr-power6 wcsrchr-c
+		   wcsrchr-power7 wcsrchr-power6 wcsrchr-c \
+		   wcscpy-power7 wcscpy-power6 wcscpy-c
 endif
diff --git a/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c
index 0489e3d651..93eb73971b 100644
--- a/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c
+++ b/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c
@@ -175,6 +175,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __wcsrchr_power6)
 	      IFUNC_IMPL_ADD (array, i, wcsrchr, 1,
 			      __wcsrchr_ppc32))
+
+  IFUNC_IMPL (i, name, wcscpy,
+	      IFUNC_IMPL_ADD (array, i, wcscpy,
+			      hwcap & PPC_FEATURE_HAS_VSX,
+			      __wcscpy_power7)
+	      IFUNC_IMPL_ADD (array, i, wcscpy,
+			      hwcap & PPC_FEATURE_ARCH_2_05,
+			      __wcscpy_power6)
+	      IFUNC_IMPL_ADD (array, i, wcscpy, 1,
+			      __wcscpy_ppc32))
 #endif
 
   return i;
diff --git a/sysdeps/powerpc/powerpc32/multiarch/wcscpy-c.c b/sysdeps/powerpc/powerpc32/multiarch/wcscpy-c.c
new file mode 100644
index 0000000000..7948f8b2fd
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/multiarch/wcscpy-c.c
@@ -0,0 +1,9 @@
+#include <wchar.h>
+
+#ifndef NOT_IN_libc
+# define WCSCPY  __wcscpy_ppc32
+#endif
+
+extern __typeof (wcscpy) __wcscpy_ppc32;
+
+#include "wcsmbs/wcscpy.c"
diff --git a/sysdeps/powerpc/powerpc32/power6/wcscpy.c b/sysdeps/powerpc/powerpc32/multiarch/wcscpy-power6.c
index 5950ef3dd9..ee1b8c4d7e 100644
--- a/sysdeps/powerpc/powerpc32/power6/wcscpy.c
+++ b/sysdeps/powerpc/powerpc32/multiarch/wcscpy-power6.c
@@ -19,12 +19,19 @@
 #include <stddef.h>
 #include <wchar.h>
 
+#ifdef WCSCPY
+# define __wcscpy_power6 WCSCPY
+#endif
+#ifndef WCSCPY_ARCH
+# define WCSCPY_ARCH "power6"
+#endif
+
+__typeof (wcscpy) __wcscpy_power6
+  __attribute__ ((__target__ ("cpu=" WCSCPY_ARCH)));
 
 /* Copy SRC to DEST.  */
 wchar_t *
-wcscpy (dest, src)
-     wchar_t *dest;
-     const wchar_t *src;
+__wcscpy_power6 (wchar_t *dest, const wchar_t *src)
 {
   wint_t c,d;
   wchar_t *wcp, *wcp2;
diff --git a/sysdeps/powerpc/powerpc32/multiarch/wcscpy-power7.c b/sysdeps/powerpc/powerpc32/multiarch/wcscpy-power7.c
new file mode 100644
index 0000000000..5f786cf747
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/multiarch/wcscpy-power7.c
@@ -0,0 +1,3 @@
+#define WCSCPY      __wcscpy_power7
+#define WCSCPY_ARCH "power7"
+#include <sysdeps/powerpc/powerpc32/multiarch/wcscpy-power6.c>
diff --git a/sysdeps/powerpc/powerpc32/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc32/multiarch/wcscpy.c
new file mode 100644
index 0000000000..795babbe9f
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/multiarch/wcscpy.c
@@ -0,0 +1,36 @@
+/* Multiple versions of wcscpy
+   Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef NOT_IN_libc
+# include <wchar.h>
+# include <shlib-compat.h>
+# include "init-arch.h"
+
+extern __typeof (wcscpy) __wcscpy_ppc32 attribute_hidden;
+extern __typeof (wcscpy) __wcscpy_power6 attribute_hidden;
+extern __typeof (wcscpy) __wcscpy_power7 attribute_hidden;
+
+libc_ifunc (wcscpy,
+	     (hwcap & PPC_FEATURE_HAS_VSX)
+             ? __wcscpy_power7 :
+	       (hwcap & PPC_FEATURE_ARCH_2_05)
+	       ? __wcscpy_power6
+             : __wcscpy_ppc32);
+#else
+#include "wcsmbs/wcscpy.c"
+#endif
diff --git a/wcsmbs/wcscpy.c b/wcsmbs/wcscpy.c
index 3b1e0c6245..6846c087b0 100644
--- a/wcsmbs/wcscpy.c
+++ b/wcsmbs/wcscpy.c
@@ -21,6 +21,10 @@
 
 
 /* Copy SRC to DEST.  */
+#ifdef WCSCPY
+# define wcscpy WCSCPY
+#endif
+
 wchar_t *
 wcscpy (dest, src)
      wchar_t *dest;