aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2015-07-28 17:12:25 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.com>2015-08-11 10:03:10 -0300
commit142e0a9953059bcf5667921f2670efec377be3d5 (patch)
treef24f484833deeee796a02f02a56cc6f89c6ffcae /string
parent14362ef154136223b0f77cb0351c31be865ab826 (diff)
downloadglibc-142e0a9953059bcf5667921f2670efec377be3d5.tar
glibc-142e0a9953059bcf5667921f2670efec377be3d5.tar.gz
glibc-142e0a9953059bcf5667921f2670efec377be3d5.tar.bz2
glibc-142e0a9953059bcf5667921f2670efec377be3d5.zip
powerpc: Use default strcpy optimization for POWER7
This patches uses the default strcpy/stpcpy implementation for POWER7/PPC64. This is faster in mostly inputs for benchtests and for multiarch the implementation uses the POWER7 strlen and memcpy. * string/stpcpy.c (__stpcpy): Use STPCPY to redefine symbol name and cleanup macro usage. * string/strcpy.c (strcpt): Use STRCPY to redefine symbol name. * sysdeps/powerpc/powerpc64/multiarch/stpcpy-power7.S: Remove file. * sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcpy-power7.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/power7/stpcpy.S: Likewise. * sysdeps/powerpc/powerpc64/power7/strcpy.S: Likewise. * sysdeps/powerpc/powerpc64/power7/strcpy.c: Likewise. * sysdeps/powerpc/powerpc64/stpcpy.S: Likewise. * sysdeps/powerpc/powerpc64/strcpy.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c [SHARED && IS_IN (libc)]: Include <string/strcpy.c>. * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c [SHARED && IS_IN (libc)]: Include <string/stpcpy.c>. * sysdeps/powerpc/powerpc64/multiarch/stpcpy-power7.c: New file. * sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcpy-power7.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.c: Likewise. * sysdeps/powerpc/powerpc64/power7/strcpy.c: Likewise.
Diffstat (limited to 'string')
-rw-r--r--string/stpcpy.c16
-rw-r--r--string/strcpy.c6
2 files changed, 9 insertions, 13 deletions
diff --git a/string/stpcpy.c b/string/stpcpy.c
index ecfb8d9255..c783fbd640 100644
--- a/string/stpcpy.c
+++ b/string/stpcpy.c
@@ -25,25 +25,17 @@
#undef __stpcpy
#undef stpcpy
-#ifndef weak_alias
-# define __stpcpy stpcpy
+#ifndef STPCPY
+# define STPCPY __stpcpy
#endif
/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */
char *
-__stpcpy (dest, src)
- char *dest;
- const char *src;
+STPCPY (char *dest, const char *src)
{
size_t len = strlen (src);
return memcpy (dest, src, len + 1) + len;
}
-#ifdef libc_hidden_def
-libc_hidden_def (__stpcpy)
-#endif
-#ifdef weak_alias
weak_alias (__stpcpy, stpcpy)
-#endif
-#ifdef libc_hidden_builtin_def
+libc_hidden_def (__stpcpy)
libc_hidden_builtin_def (stpcpy)
-#endif
diff --git a/string/strcpy.c b/string/strcpy.c
index 3ebb51bfd9..c2274622ef 100644
--- a/string/strcpy.c
+++ b/string/strcpy.c
@@ -20,9 +20,13 @@
#undef strcpy
+#ifndef STRCPY
+# define STRCPY strcpy
+#endif
+
/* Copy SRC to DEST. */
char *
-strcpy (char *dest, const char *src)
+STRCPY (char *dest, const char *src)
{
return memcpy (dest, src, strlen (src) + 1);
}