summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/sparc/sparc64/rtld-memcpy.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 496467e1c7..2d3f8cb024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-14  David S. Miller  <davem@davemloft.net>
+
+	* sysdeps/sparc/sparc64/rtld-memcpy.c (NO_MEMPCPY_STPCPY_REDIRECT):
+	Define before including <string/memcpy.c> and <string/mempcpy.c>.
+
 2014-11-14  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.ac (libc_cv_compiler_ok): Require GCC 4.6 or later.
diff --git a/sysdeps/sparc/sparc64/rtld-memcpy.c b/sysdeps/sparc/sparc64/rtld-memcpy.c
index b1b06479d2..52f8302f08 100644
--- a/sysdeps/sparc/sparc64/rtld-memcpy.c
+++ b/sysdeps/sparc/sparc64/rtld-memcpy.c
@@ -1,2 +1,3 @@
+#define NO_MEMPCPY_STPCPY_REDIRECT
 #include <string/memcpy.c>
 #include <string/mempcpy.c>