aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-01-03 17:05:32 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-01-03 17:48:03 -0200
commit640e44c5d0b2d0528a336d73c2c7d6dfbb266000 (patch)
tree1b723f4538c3e891c23c358237dde487186bc8e7
parente9a96ea1aca4ebaa7c86e8b83b766f118d689d0f (diff)
downloadglibc-640e44c5d0b2d0528a336d73c2c7d6dfbb266000.tar
glibc-640e44c5d0b2d0528a336d73c2c7d6dfbb266000.tar.gz
glibc-640e44c5d0b2d0528a336d73c2c7d6dfbb266000.tar.bz2
glibc-640e44c5d0b2d0528a336d73c2c7d6dfbb266000.zip
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.
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/ia64/strcat.c26
-rw-r--r--sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c2
-rw-r--r--sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c2
-rw-r--r--sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c2
-rw-r--r--sysdeps/powerpc/strcat.c33
6 files changed, 12 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e78a07524..c3a8fe04a5 100644
--- 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
index 3bae06b061..0000000000
--- 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 ef93a5c6bc..22d2caaec3 100644
--- 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 af4c2f833a..d6e69b1940 100644
--- 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 1bceb6449b..5049fc03f4 100644
--- 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
index 13c64dbac6..0000000000
--- 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)