diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-04-17 22:20:47 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-04-17 22:20:47 -0400 |
| commit | 4c559bcdf38d7b655860c1a31c590109f37cc0fe (patch) | |
| tree | 8f252ec52683dbed088393dd6d3867a23f687039 | |
| parent | 4420675c9d361643d1179ad67e0bb35c8fbdd1ce (diff) | |
| download | glibc-4c559bcdf38d7b655860c1a31c590109f37cc0fe.tar.gz glibc-4c559bcdf38d7b655860c1a31c590109f37cc0fe.tar.xz glibc-4c559bcdf38d7b655860c1a31c590109f37cc0fe.zip | |
Fix static linking with checking x86/x86-64 memcpy.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S | 2 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/memcpy-ssse3.S | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/memcpy-ssse3-back.S | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/memcpy-ssse3.S | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 71a7364eef..41e14309c7 100644 --- 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 e5e4b773c1..f8e1685cd1 100644 --- 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 Version 2.13 diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S index 48a109ccd6..8e81183827 100644 --- 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 ec9eeb95e4..f64f8d2146 100644 --- 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 48c974e97f..bdd114a1bd 100644 --- 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 9a878d35ff..cd7e45f255 100644 --- 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) |