forked from pool/glibc
79d8599db0
Fix static builds OBS-URL: https://build.opensuse.org/request/show/71357 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=54
62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
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.
|
|
|
|
Index: glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
|
|
===================================================================
|
|
--- glibc-2.13.orig/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
|
|
+++ glibc-2.13/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)
|
|
Index: glibc-2.13/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
|
|
===================================================================
|
|
--- glibc-2.13.orig/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
|
|
+++ glibc-2.13/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)
|
|
Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
|
|
===================================================================
|
|
--- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
|
|
+++ glibc-2.13/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)
|
|
Index: glibc-2.13/sysdeps/x86_64/multiarch/memcpy-ssse3.S
|
|
===================================================================
|
|
--- glibc-2.13.orig/sysdeps/x86_64/multiarch/memcpy-ssse3.S
|
|
+++ glibc-2.13/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)
|