LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix SEGV when unwinding stack pasts __libc_init"

Browse Source
This commit is contained in:
Andrew Hsieh
2012-06-29 09:48:22 -07:00
committed by android code review
parent 568cb2b2ef 556182feb4
commit 435a7da6d0
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ndk/platforms/android-3/arch-arm/src/crtbegin_dynamic.S
View File

@@ -53,7 +53,9 @@ _start:
ldr r2, =main ldr r2, =main
adr r3, 1f adr r3, 1f
ldr r4, =__libc_init ldr r4, =__libc_init
bx r4 blx r4
mov r0, #0
bx r0
1: .long __PREINIT_ARRAY__ 1: .long __PREINIT_ARRAY__
.long __INIT_ARRAY__ .long __INIT_ARRAY__

4
ndk/platforms/android-3/arch-arm/src/crtbegin_static.S
View File

@@ -53,7 +53,9 @@ _start:
ldr r2, =main ldr r2, =main
adr r3, 1f adr r3, 1f
ldr r4, =__libc_init ldr r4, =__libc_init
bx r4 blx r4
mov r0, #0
bx r0
1: .long __PREINIT_ARRAY__ 1: .long __PREINIT_ARRAY__
.long __INIT_ARRAY__ .long __INIT_ARRAY__

2
ndk/platforms/android-9/arch-mips/src/crtbegin_dynamic.S
View File

@@ -64,6 +64,8 @@ _start:
la $a3, 1f la $a3, 1f
subu $sp, 32 subu $sp, 32
la $t9, __libc_init la $t9, __libc_init
jalr $t9
move $t9, $0
j $t9 j $t9
.end __start .end __start

2
ndk/platforms/android-9/arch-mips/src/crtbegin_static.S
View File

@@ -64,6 +64,8 @@ _start:
la $a3, 1f la $a3, 1f
subu $sp, 32 subu $sp, 32
la $t9, __libc_init la $t9, __libc_init
jalr $t9
move $t9, $0
j $t9 j $t9
.end __start .end __start