[commits] r14286 - in /branches/eglibc-2_13/libc: ./ sysdeps/i386/i686/multiarch/ sysdeps/x86_64/multiarch/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Jun 21 08:46:04 2011
New Revision: 14286

Log:
Merge changes between r13355 and r14285 from /fsf/glibc-2_13-branch.

Modified:
    branches/eglibc-2_13/libc/ChangeLog
    branches/eglibc-2_13/libc/NEWS
    branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
    branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
    branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
    branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S

Modified: branches/eglibc-2_13/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_13/libc/ChangeLog (original)
+++ branches/eglibc-2_13/libc/ChangeLog Tue Jun 21 08:46:04 2011
@@ -1,3 +1,12 @@
+2011-02-06  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	[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@xxxxxxxxxx>
 	    Ulrich Drepper  <drepper@xxxxxxxxx>
 

Modified: branches/eglibc-2_13/libc/NEWS
==============================================================================
--- branches/eglibc-2_13/libc/NEWS (original)
+++ branches/eglibc-2_13/libc/NEWS Tue Jun 21 08:46:04 2011
@@ -13,7 +13,7 @@
   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
 

Modified: branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
==============================================================================
--- branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S (original)
+++ branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S Tue Jun 21 08:46:04 2011
@@ -110,7 +110,7 @@
 #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)

Modified: branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
==============================================================================
--- branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S (original)
+++ branches/eglibc-2_13/libc/sysdeps/i386/i686/multiarch/memcpy-ssse3.S Tue Jun 21 08:46:04 2011
@@ -110,7 +110,7 @@
 #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)

Modified: branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
==============================================================================
--- branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S (original)
+++ branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S Tue Jun 21 08:46:04 2011
@@ -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)

Modified: branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S
==============================================================================
--- branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S (original)
+++ branches/eglibc-2_13/libc/sysdeps/x86_64/multiarch/memcpy-ssse3.S Tue Jun 21 08:46:04 2011
@@ -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)