[commits] r9936 - in /fsf/trunk/libc: ChangeLog sysdeps/i386/i686/multiarch/strcmp-sse4.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Feb 27 00:03:04 2010
New Revision: 9936

Log:
Import glibc-mainline for 2010-02-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-sse4.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Feb 27 00:03:04 2010
@@ -1,3 +1,9 @@
+2010-02-20  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #11332]
+	* sysdeps/i386/i686/multiarch/strcmp-sse4.S: Use cfi_remember_state
+	and cfi_restore_state only if USE_AS_STRNCMP is defined.
+
 2010-02-24  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/x86_64/Implies: Add ieee754/dbl-64/wordsize-64 entry.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-sse4.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-sse4.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp-sse4.S Sat Feb 27 00:03:04 2010
@@ -178,7 +178,9 @@
 	PUSH	(%ebx)
 	PUSH	(%edi)
 	PUSH	(%esi)
+#ifdef USE_AS_STRNCMP
 	cfi_remember_state
+#endif
 	mov	%edx, %edi
 	mov	%eax, %esi
 	xorl	%eax, %eax
@@ -246,8 +248,8 @@
 	ret
 
 	.p2align 4
+#ifdef USE_AS_STRNCMP
 	cfi_restore_state
-#ifdef USE_AS_STRNCMP
 L(more16byteseq):
 	POP	(%esi)
 	POP	(%edi)