Merge "Fix SEGV when unwinding stack pasts __libc_init"

2012-06-29 09:48:22 -07:00
parent 568cb2b2ef 556182feb4
commit 435a7da6d0
4 changed files with 10 additions and 2 deletions
--- a/ndk/platforms/android-3/arch-arm/src/crtbegin_dynamic.S
+++ b/ndk/platforms/android-3/arch-arm/src/crtbegin_dynamic.S
@@ -53,7 +53,9 @@ _start:
 	ldr	r2, =main
 	adr	r3, 1f
 	ldr	r4, =__libc_init
-	bx	r4
+	blx	r4
+	mov	r0, #0
+	bx	r0

 1:  .long   __PREINIT_ARRAY__
    .long   __INIT_ARRAY__
--- a/ndk/platforms/android-3/arch-arm/src/crtbegin_static.S
+++ b/ndk/platforms/android-3/arch-arm/src/crtbegin_static.S
@@ -53,7 +53,9 @@ _start:
 	ldr	r2, =main
 	adr	r3, 1f
 	ldr	r4, =__libc_init
-	bx	r4
+	blx	r4
+	mov	r0, #0
+	bx	r0

 1:  .long   __PREINIT_ARRAY__
    .long   __INIT_ARRAY__
--- a/ndk/platforms/android-9/arch-mips/src/crtbegin_dynamic.S
+++ b/ndk/platforms/android-9/arch-mips/src/crtbegin_dynamic.S
@@ -64,6 +64,8 @@ _start:
 	la	$a3, 1f
 	subu	$sp, 32
 	la	$t9, __libc_init
+	jalr	$t9
+	move	$t9, $0
 	j	$t9
 	.end	__start

--- a/ndk/platforms/android-9/arch-mips/src/crtbegin_static.S
+++ b/ndk/platforms/android-9/arch-mips/src/crtbegin_static.S
@@ -64,6 +64,8 @@ _start:
 	la	$a3, 1f
 	subu	$sp, 32
 	la	$t9, __libc_init
+	jalr	$t9
+	move	$t9, $0
 	j	$t9
 	.end	__start