| commit | 4327ae07b98d24128adbdfd93e9ed15cfce7e2ed | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu Feb 18 18:46:28 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Feb 18 18:46:28 2016 +0000 |
| tree | 39ad32190bed3469ff655246cf5da8042f8663f1 | |
| parent | 90ea63a862e2a23c9a72d4fa18ea15c830b25fc8 [diff] | |
| parent | 97b6e131fd85bb0ae321d9e5a8a613f5ee373cf4 [diff] |
Merge "Fix cfi directives for memmove/strlcpy."
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. */