generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of 883ef249 to klp-dev-plus-aosp

Browse Source 
Change-Id: I1e2bd03a0cb5a0ab191c525d1574377bc7fd90ab
This commit is contained in:
Christopher Ferris
2013-09-10 19:49:04 -07:00
parent 5cb0436930 883ef2499c
commit 2e7a8b44c2
10 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-arm/cortex-a15/bionic/__strcat_chk.S
View File

@@ -180,7 +180,7 @@ ENTRY(__strcat_chk)
.L_strlen_done:
add r2, r3, r4
cmp r2, lr
bgt __strcat_chk_failed
bhi __strcat_chk_failed
// Set up the registers for the memcpy code.
mov r1, r5

2
libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S
View File

@@ -151,7 +151,7 @@ ENTRY(__strcpy_chk)
pld [r1, #64]
ldr r0, [sp]
cmp r3, lr
bge __strcpy_chk_failed
bhs __strcpy_chk_failed
// Add 1 for copy length to get the string terminator.
add r2, r3, #1

2
libc/arch-arm/cortex-a15/bionic/memcpy.S
View File

@@ -65,7 +65,7 @@
ENTRY(__memcpy_chk)
.cfi_startproc
cmp r2, r3
bgt __memcpy_chk_fail
bhi __memcpy_chk_fail
// Fall through to memcpy...
.cfi_endproc

2
libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
View File

@@ -183,7 +183,7 @@ ENTRY(__strcat_chk)
.L_strlen_done:
add r2, r3, r4
cmp r2, lr
bgt __strcat_chk_fail
bhi __strcat_chk_fail
// Set up the registers for the memcpy code.
mov r1, r5

2
libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
View File

@@ -153,7 +153,7 @@ ENTRY(__strcpy_chk)
pld [r1, #64]
ldr r0, [sp]
cmp r3, lr
bge __strcpy_chk_fail
bhs __strcpy_chk_fail
// Add 1 for copy length to get the string terminator.
add r2, r3, #1

2
libc/arch-arm/cortex-a9/bionic/memcpy.S
View File

@@ -43,7 +43,7 @@
ENTRY(__memcpy_chk)
.cfi_startproc
cmp r2, r3
bgt __memcpy_chk_fail
bhi __memcpy_chk_fail
// Fall through to memcpy...
.cfi_endproc

2
libc/arch-arm/krait/bionic/__strcat_chk.S
View File

@@ -180,7 +180,7 @@ ENTRY(__strcat_chk)
.L_strlen_done:
add r2, r3, r4
cmp r2, lr
bgt __strcat_chk_failed
bhi __strcat_chk_failed
// Set up the registers for the memcpy code.
mov r1, r5

2
libc/arch-arm/krait/bionic/__strcpy_chk.S
View File

@@ -151,7 +151,7 @@ ENTRY(__strcpy_chk)
pld [r1, #64]
ldr r0, [sp]
cmp r3, lr
bge __strcpy_chk_failed
bhs __strcpy_chk_failed
// Add 1 for copy length to get the string terminator.
add r2, r3, #1

2
libc/arch-arm/krait/bionic/memcpy.S
View File

@@ -46,7 +46,7 @@
ENTRY(__memcpy_chk)
.cfi_startproc
cmp r2, r3
bgt __memcpy_chk_fail
bhi __memcpy_chk_fail
// Fall through to memcpy...
.cfi_endproc