pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix cfi directives for memmove/strlcpy. 

Bug: 27227225

(cherry picked from commit 97b6e131fd)

Change-Id: I9462340a478d9b699240703d8da5967000a33d08
This commit is contained in:
Christopher Ferris 2016-02-17 19:17:02 -08:00
parent bff9cca9ca
commit 08d6edf522
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-x86/atom/string/ssse3-strcpy-atom.S
View File

@ -3147,7 +3147,7 @@ L(ExitTail16):
#endif #endif
#ifdef USE_AS_STRNCPY #ifdef USE_AS_STRNCPY
# ifndef USE_AS_STRCAT # if !defined(USE_AS_STRCAT) && !defined(USE_AS_STRLCPY)
CFI_PUSH (%esi) CFI_PUSH (%esi)
CFI_PUSH (%edi) CFI_PUSH (%edi)
# endif # endif

3
libc/arch-x86/silvermont/string/sse2-memmove-slm.S
View File

@ -327,6 +327,9 @@ L(mm_len_9_16_bytes_forward):
movq %xmm1, -8(%edx, %ecx) movq %xmm1, -8(%edx, %ecx)
jmp L(mm_return) jmp L(mm_return)
CFI_POP (%edi)
CFI_POP (%esi)
L(mm_recalc_len): L(mm_recalc_len):
/* Compute in %ecx how many bytes are left to copy after /* Compute in %ecx how many bytes are left to copy after
the main loop stops. */ the main loop stops. */