Fix static linking with checking x86/x86-64 memcpy.

diff --git a/ChangeLog b/ChangeLog
index 71a7364eef610e27fc078e426e80d6cdffc8d5eb..41e14309c76598cf8a2438e3fdab51562f8a34dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-06  Mike Frysinger  <vapier@gentoo.org>
+
+       [BZ #12653]
+       * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Only protect
+       MEMCPY_CHK with USE_AS_BCOPY ifdef check.
+       * sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise.
+       * sysdeps/x86_64/multiarch/memcpy-ssse3.S: Likewise.
+       * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: Likewise.
+
 2011-03-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/powerpc/powerpc32/power4/strncmp.S: Don't read past

diff --git a/NEWS b/NEWS
index e5e4b773c116460f695cda2dc351b90409554446..f8e1685cd1d4c53994858929b21e94c9e647e865 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 2.14
 * The following bugs are resolved with this release:
 
   11724, 12420, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 12518, 12583,
-  12587, 12597, 12631, 12650, 12655
+  12587, 12597, 12631, 12650, 12653, 12655
 \f
 Version 2.13
 

diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
index 48a109ccd6ff2192b57d0f307bb72ca0a4817b76..8e8118382706c37a4e66ca629fde4dd916b148bf 100644 (file)
--- a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
@@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx:
 #endif
 
        .section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY
+#if !defined USE_AS_BCOPY
 ENTRY (MEMCPY_CHK)
        movl    12(%esp), %eax
        cmpl    %eax, 16(%esp)

diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
index ec9eeb95e4e57105b8e1513440c69c458dda9186..f64f8d214641b14524716fc2999b5fb87767718e 100644 (file)
--- a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
@@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx:
 #endif
 
        .section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY
+#if !defined USE_AS_BCOPY
 ENTRY (MEMCPY_CHK)
        movl    12(%esp), %eax
        cmpl    %eax, 16(%esp)

diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
index 48c974e97f8ed9d99c6c5f3f0cad3496e4a4105d..bdd114a1bdddda5cde6563b57de17edfde43408d 100644 (file)
--- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
@@ -49,7 +49,7 @@
   ud2
 
        .section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc
+#if !defined USE_AS_BCOPY
 ENTRY (MEMCPY_CHK)
        cmpq    %rdx, %rcx
        jb      HIDDEN_JUMPTARGET (__chk_fail)

diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/sysdeps/x86_64/multiarch/memcpy-ssse3.S
index 9a878d35ff9173f411260966cf05a8eb538f929d..cd7e45f25597ec83b8c1ad597e9335d28ab11fb8 100644 (file)
--- a/sysdeps/x86_64/multiarch/memcpy-ssse3.S
+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3.S
@@ -49,7 +49,7 @@
   ud2
 
        .section .text.ssse3,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc
+#if !defined USE_AS_BCOPY
 ENTRY (MEMCPY_CHK)
        cmpq    %rdx, %rcx
        jb      HIDDEN_JUMPTARGET (__chk_fail)