commit bff9cca9ca5817e97dd43962bb11b012cbb97f54
author Christopher Ferris <cferris@google.com> Wed Feb 17 16:34:02 2016 -0800
committer Christopher Ferris <cferris@google.com> Wed Feb 17 17:59:14 2016 -0800
tree 3f789d37084654a4c31823f43816fe475dc5c032
parent ee478ead7dc30235509e36f7675e1b62484bc25d

Fix cfi directives in small strncmp case.

Bug: 27227225

(cherry picked from commit de84e51f8c7b45869a8f83a1d5eacbf19b6d5eb5)

Change-Id: I7ebbd1cf9bff849ecdfc84e0e98842fec3215bb4

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):