2 files changed, 10 insertions, 6 deletions
diff --git a/string/memcpy.c b/string/memcpy.c
index a1c4c72d67..2315b6fecb 100644
--- a/string/memcpy.c
+++ b/string/memcpy.c
@@ -21,10 +21,12 @@
 #include <string.h>
 #include <memcopy.h>
 
-#undef memcpy
+#ifndef MEMCPY
+# define MEMCPY memcpy
+#endif
 
 void *
-memcpy (void *dstpp, const void *srcpp, size_t len)
+MEMCPY (void *dstpp, const void *srcpp, size_t len)
 {
   unsigned long int dstp = (long int) dstpp;
   unsigned long int srcp = (long int) srcpp;
@@ -57,4 +59,4 @@ memcpy (void *dstpp, const void *srcpp, size_t len)
 
   return dstpp;
 }
-libc_hidden_builtin_def (memcpy)
+libc_hidden_builtin_def (MEMCPY)
diff --git a/string/memset.c b/string/memset.c
index 4ac8cb6426..950445c51c 100644
--- a/string/memset.c
+++ b/string/memset.c
@@ -18,11 +18,13 @@
 #include <string.h>
 #include <memcopy.h>
 
-#undef memset
+#ifndef MEMSET
+# define MEMSET memset
+#endif
 
 void *
 inhibit_loop_to_libcall
-memset (void *dstpp, int c, size_t len)
+MEMSET (void *dstpp, int c, size_t len)
 {
   long int dstp = (long int) dstpp;
 
@@ -85,4 +87,4 @@ memset (void *dstpp, int c, size_t len)
 
   return dstpp;
 }
-libc_hidden_builtin_def (memset)
+libc_hidden_builtin_def (MEMSET)