| commit | 08d6edf52249e34942d8ed2af6c35b1e2980bc6d | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Feb 17 19:17:02 2016 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Thu Feb 18 10:50:08 2016 -0800 |
| tree | abbfd5465f6a6c61d0ea5f522cdcb0a05e69e2ed | |
| parent | bff9cca9ca5817e97dd43962bb11b012cbb97f54 [diff] |
Fix cfi directives for memmove/strlcpy. Bug: 27227225 (cherry picked from commit 97b6e131fd85bb0ae321d9e5a8a613f5ee373cf4) Change-Id: I9462340a478d9b699240703d8da5967000a33d08
diff --git a/libc/arch-x86/atom/string/ssse3-strcpy-atom.S b/libc/arch-x86/atom/string/ssse3-strcpy-atom.S index 30254ca..3690b0d 100644 --- a/libc/arch-x86/atom/string/ssse3-strcpy-atom.S +++ b/libc/arch-x86/atom/string/ssse3-strcpy-atom.S
@@ -3147,7 +3147,7 @@ #endif #ifdef USE_AS_STRNCPY -# ifndef USE_AS_STRCAT +# if !defined(USE_AS_STRCAT) && !defined(USE_AS_STRLCPY) CFI_PUSH (%esi) CFI_PUSH (%edi) # endif
diff --git a/libc/arch-x86/silvermont/string/sse2-memmove-slm.S b/libc/arch-x86/silvermont/string/sse2-memmove-slm.S index b971f0b..6a8f067 100644 --- a/libc/arch-x86/silvermont/string/sse2-memmove-slm.S +++ b/libc/arch-x86/silvermont/string/sse2-memmove-slm.S
@@ -327,6 +327,9 @@ movq %xmm1, -8(%edx, %ecx) jmp L(mm_return) + CFI_POP (%edi) + CFI_POP (%esi) + L(mm_recalc_len): /* Compute in %ecx how many bytes are left to copy after the main loop stops. */