commit de84e51f8c7b45869a8f83a1d5eacbf19b6d5eb5
author Christopher Ferris <cferris@google.com> Wed Feb 17 16:34:02 2016 -0800
committer Christopher Ferris <cferris@google.com> Wed Feb 17 16:34:02 2016 -0800
tree 8f5e5f0790d13cf1b5633030eef666750d8feb24
parent c347a107602f3011b393f2b2407425b5d668e14e

Fix cfi directives in small strncmp case.

Bug: 27227225
Change-Id: Id4f88fe288109a82822ad1b2291858c1c85b0ca7

libc/arch-x86/atom/string/ssse3-strcmp-atom.S

diff --git a/libc/arch-x86/atom/string/ssse3-strcmp-atom.S b/libc/arch-x86/atom/string/ssse3-strcmp-atom.S
index 1275379..ee253b9 100644
--- a/libc/arch-x86/atom/string/ssse3-strcmp-atom.S
+++ b/libc/arch-x86/atom/string/ssse3-strcmp-atom.S
@@ -115,6 +115,7 @@
 ENTRY (STRCMP)
 #ifdef USE_AS_STRNCMP
 	PUSH	(%ebp)
+	cfi_remember_state
 #endif
 	movl	STR1(%esp), %edx
 	movl	STR2(%esp), %eax
@@ -213,9 +214,6 @@
 	PUSH	(%ebx)
 	PUSH	(%edi)
 	PUSH	(%esi)
-#ifdef USE_AS_STRNCMP
-	cfi_remember_state
-#endif
 
 	movl	%edx, %edi
 	movl	%eax, %ecx
@@ -2103,7 +2101,6 @@
 	RETURN
 
 #ifdef USE_AS_STRNCMP
-	cfi_restore_state
 	.p2align 4
 L(more8byteseq):
 	POP	(%esi)
@@ -2120,7 +2117,7 @@
 	ret
 
 #ifdef USE_AS_STRNCMP
-	CFI_PUSH (%ebp)
+	cfi_restore_state
 
 	.p2align 4
 L(less16bytes_sncmp):