From: H.J. Lu <hongjiu.lu@intel.com>
Date: Sat, 27 Feb 2010 03:54:50 +0000 (-0800)
Subject: Fix unwind info in x86 strcmp-sse4.S
X-Git-Tag: upstream/2.30~12990
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc21aae6c11c65b26cc27fc1172d669956fbacb7;p=external%2Fglibc.git

Fix unwind info in x86 strcmp-sse4.S
---

diff --git a/ChangeLog b/ChangeLog
index dc3c8d7..e72551b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* 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@redhat.com>
 
 	* sysdeps/x86_64/Implies: Add ieee754/dbl-64/wordsize-64 entry.
diff --git a/sysdeps/i386/i686/multiarch/strcmp-sse4.S b/sysdeps/i386/i686/multiarch/strcmp-sse4.S
index d5fd23e..81d6ec6 100644
--- a/sysdeps/i386/i686/multiarch/strcmp-sse4.S
+++ b/sysdeps/i386/i686/multiarch/strcmp-sse4.S
@@ -178,7 +178,9 @@ L(first4bytes):
 	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 @@ L(ret):
 	ret
 
 	.p2align 4
-	cfi_restore_state
 #ifdef USE_AS_STRNCMP
+	cfi_restore_state
 L(more16byteseq):
 	POP	(%esi)
 	POP	(%edi)