diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-21 15:46:04 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-21 15:46:04 +0000 |
| commit | 65ada7bbba4d86bb6f4c756f9fe096c61da986d7 (patch) | |
| tree | 2ae5cacd8f87614076a2921e7f7821e046c36d88 | |
| parent | f0cb2f8f637f55aa89083c4c06a326c4eef62275 (diff) | |
| download | eglibc2-65ada7bbba4d86bb6f4c756f9fe096c61da986d7.tar.gz | |
Merge changes between r13355 and r14285 from /fsf/glibc-2_13-branch.
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_13@14286 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog | 9 | ||||
| -rw-r--r-- | libc/NEWS | 2 | ||||
| -rw-r--r-- | libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S | 2 | ||||
| -rw-r--r-- | libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S | 2 | ||||
| -rw-r--r-- | libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S | 2 | ||||
| -rw-r--r-- | libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index 31c7554b2..9d3222a92 100644 --- a/libc/ChangeLog +++ b/libc/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. + 2010-09-28 Andreas Schwab <schwab@redhat.com> Ulrich Drepper <drepper@gmail.com> @@ -13,7 +13,7 @@ Version 2.13 11655, 11701, 11840, 11856, 11883, 11903, 11904, 11968, 11979, 12005, 12037, 12067, 12077, 12078, 12092, 12093, 12107, 12108, 12113, 12140, 12159, 12167, 12191, 12194, 12201, 12204, 12205, 12207, 12348, 12378, - 12394, 12397, 12489 + 12394, 12397, 12489, 12653 * New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark diff --git a/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S index 48a109ccd..8e8118382 100644 --- a/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S +++ b/libc/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/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S index ec9eeb95e..f64f8d214 100644 --- a/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S +++ b/libc/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/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S index 48c974e97..bdd114a1b 100644 --- a/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S +++ b/libc/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/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S index 9a878d35f..cd7e45f25 100644 --- a/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S +++ b/libc/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) |