Remove duplicate strcat implementations

Since commit 6e46de42fe16 default strcat implementation is essentially
the same for specialized ia64 and powerpc ones.  This patch removes the
redundant implementation and adjust powerpc64 ifunc code to use the
default one.

Checked on powerpc32-linux-gnu (default and power4) and ia64-linux build
and on powerpc64le-linux-gnu.

	* sysdeps/ia64/strcat.c: Remove file.
	* sysdeps/powerpc/strcat.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c: Use default
	C implementation.
	* sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1e78a0752418b462c133da77ff29412fe6b39c53..c3a8fe04a5a8455c41c9ed43c6e254a473ae5900 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-01-03  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+       * sysdeps/ia64/strcat.c: Remove file.
+       * sysdeps/powerpc/strcat.c: Likewise.
+       * sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c: Use default
+       C implementation.
+       * sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c: Likewise.
+       * sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c: Likewise.
+
 2017-01-03  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
            Steven Munroe  <sjmunroe@us.ibm.com>
            Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>

diff --git a/sysdeps/ia64/strcat.c b/sysdeps/ia64/strcat.c
deleted file mode 100644 (file)
index 3bae06b..0000000
--- a/sysdeps/ia64/strcat.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 2004-2017 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/>.  */
-
-#include <string.h>
-
-char *
-strcat (char *dest, const char *src)
-{
-  strcpy (dest + strlen (dest), src);
-  return dest;
-}
-libc_hidden_builtin_def (strcat)

diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c b/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c
index ef93a5c6bc9949b03aaef75032cdec1f82d5a3a6..22d2caaec3e8c8591cecfb641932d70b234224e1 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c
@@ -27,4 +27,4 @@ extern typeof (strlen) __strlen_power7;
 
 #define strcpy __strcpy_power7
 #define strlen __strlen_power7
-#include <sysdeps/powerpc/strcat.c>
+#include <string/strcat.c>

diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c b/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
index af4c2f833a48bf9715de7bf1aeea7e000185acc0..d6e69b194085958314ab6df37b79180ccff5fadf 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
@@ -27,4 +27,4 @@ extern typeof (strlen) __strlen_power7;
 
 #define strcpy __strcpy_power8
 #define strlen __strlen_power7
-#include <sysdeps/powerpc/strcat.c>
+#include <string/strcat.c>

diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c
index 1bceb6449b74daf4d6d4e76229fc5b2a690af797..5049fc03f43172d3cba5d0c9eccbd1dcf9badabb 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c
@@ -26,4 +26,4 @@
 
 extern __typeof (strcat) __strcat_ppc attribute_hidden;
 
-#include <sysdeps/powerpc/strcat.c>
+#include <string/strcat.c>

diff --git a/sysdeps/powerpc/strcat.c b/sysdeps/powerpc/strcat.c
deleted file mode 100644 (file)
index 13c64db..0000000
--- a/sysdeps/powerpc/strcat.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* strcat version that uses fast strcpy/strlen.
-   Copyright (C) 1997-2017 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/>.  */
-
-#include <string.h>
-
-#ifndef STRCAT
-# undef strcat
-# define STRCAT  strcat
-#endif
-
-/* Append SRC on the end of DEST.  */
-char *
-STRCAT(char *dest, const char *src)
-{
-  strcpy (dest + strlen (dest), src);
-  return dest;
-}
-libc_hidden_builtin_def (STRCAT)