Revert "i586: Fix multiple definitions of __memcpy_chk and __mempcpy_chk"

This reverts commit 3148714ab61ad61281bae5a30f530d637034ac3b.

I had the wrong cherry-pick reference (the commit content is right; it's
just referring to a base that isn't upstream), but let's revert and reapply
for clarity.

Signed-off-by: Sam James <sam@gentoo.org>

diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S
index 79856d498af90f66a948460c92d1b14fedfa8aee..3e26f112d685e1482246baa932d368d215a0652f 100644 (file)
--- a/sysdeps/i386/i586/memcpy.S
+++ b/sysdeps/i386/i586/memcpy.S
@@ -26,7 +26,7 @@
 #define LEN    SRC+4
 
         .text
-#if defined SHARED && IS_IN (libc)
+#if defined PIC && IS_IN (libc)
 ENTRY (__memcpy_chk)
        movl    12(%esp), %eax
        cmpl    %eax, 16(%esp)