powerpc: Remove POWER7 wordcopy ifunc

This patch remove the POWER7 ifunc wordcopy function
(_wordcopy_*_power7), since now GLIBC provides a optimized memmove/bcopy
for POWER7.

4 files changed, 18 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index d5796a4e97..f5c29413aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2015-02-09  Adhemerval Zanellla  <azanella@linux.vnet.ibm.com>
 
+	* sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
+	Remove wordcopy-power7 object.
+	* sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c: Remove file.
+	* sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
+	(_wordcopy_fwd_aligned): Remove POWER7 specialization.
+	(_wordcopy_fwd_dest_aligned): Likewise.
+	(_wordcopy_bwd_aligned): Likewise.
+	(_wordcopy_bwd_dest_aligned): Likewise.
+
 	* sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c (__bcopy_ppc):
 	Rewrite to call __memmove_ppc instead of include default
 	implementation.
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
index fe4f255c87..0111ad6ab9 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
@@ -11,7 +11,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
 		   strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \
 		   strchr-power7 strchr-ppc64 \
 		   strchrnul-power7 strchrnul-ppc64 \
-		   wordcopy-power7 wordcopy-power6 wordcopy-ppc64 \
+		   wordcopy-power6 wordcopy-ppc64 \
 		   strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \
 		   stpcpy-power7 stpcpy-ppc64 \
 		   strrchr-power7 strrchr-ppc64 strncat-power7 strncat-ppc64 \
@@ -23,7 +23,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
 
 CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
 CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
-CFLAGS-wordcopy-power7.c += -mcpu=power7
 CFLAGS-wordcopy-power6.c += -mcpu=power6
 endif
 
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c
deleted file mode 100644
index 3c54623bff..0000000000
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* wordcopy routines for powerpc64/power7.
-   Copyright (C) 2013-2015 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; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power7.c>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
index cc27540a85..ec397326cb 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
@@ -26,14 +26,10 @@ extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc
 attribute_hidden;
 extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6
 attribute_hidden;
-extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7
-attribute_hidden;
 
 libc_ifunc (_wordcopy_fwd_aligned,
-            (hwcap & PPC_FEATURE_HAS_VSX)
-            ? _wordcopy_fwd_aligned_power7 :
-	      (hwcap & PPC_FEATURE_ARCH_2_05)
-              ? _wordcopy_fwd_aligned_power6
+	    (hwcap & PPC_FEATURE_ARCH_2_05)
+            ? _wordcopy_fwd_aligned_power6
             : _wordcopy_fwd_aligned_ppc);
 
 
@@ -41,14 +37,10 @@ extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc
 attribute_hidden;
 extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6
 attribute_hidden;
-extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7
-attribute_hidden;
 
 libc_ifunc (_wordcopy_fwd_dest_aligned,
-            (hwcap & PPC_FEATURE_HAS_VSX)
-            ? _wordcopy_fwd_dest_aligned_power7 :
-	      (hwcap & PPC_FEATURE_ARCH_2_05)
-              ? _wordcopy_fwd_dest_aligned_power6
+	    (hwcap & PPC_FEATURE_ARCH_2_05)
+            ? _wordcopy_fwd_dest_aligned_power6
             : _wordcopy_fwd_dest_aligned_ppc);
 
 
@@ -56,14 +48,10 @@ extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc
 attribute_hidden;
 extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6
 attribute_hidden;
-extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7
-attribute_hidden;
 
 libc_ifunc (_wordcopy_bwd_aligned,
-            (hwcap & PPC_FEATURE_HAS_VSX)
-            ? _wordcopy_bwd_aligned_power7 :
-	      (hwcap & PPC_FEATURE_ARCH_2_05)
-              ? _wordcopy_bwd_aligned_power6
+	    (hwcap & PPC_FEATURE_ARCH_2_05)
+            ? _wordcopy_bwd_aligned_power6
             : _wordcopy_bwd_aligned_ppc);
 
 
@@ -71,14 +59,10 @@ extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc
 attribute_hidden;
 extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6
 attribute_hidden;
-extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7
-attribute_hidden;
 
 libc_ifunc (_wordcopy_bwd_dest_aligned,
-            (hwcap & PPC_FEATURE_HAS_VSX)
-            ? _wordcopy_bwd_dest_aligned_power7 :
-	      (hwcap & PPC_FEATURE_ARCH_2_05)
-              ? _wordcopy_bwd_dest_aligned_power6
+	    (hwcap & PPC_FEATURE_ARCH_2_05)
+            ? _wordcopy_bwd_dest_aligned_power6
             : _wordcopy_bwd_dest_aligned_ppc);
 
 #else