diff options
| author | Elliott Hughes <enh@google.com> | 2012-04-12 11:52:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 11:52:44 -0700 |
| commit | d5099016f70b5acbfeb969787687099df703a4f4 (patch) | |
| tree | ba32e3aaf26560aea0dff1f399e44f59c2800e70 /libc | |
| parent | 470835b215c14aa5ff2368527feeff35bfb46a90 (diff) | |
| parent | cd15bacf334ab254a5f61c3bba100adde1b6b80a (diff) | |
| download | bionic-d5099016f70b5acbfeb969787687099df703a4f4.zip bionic-d5099016f70b5acbfeb969787687099df703a4f4.tar.gz bionic-d5099016f70b5acbfeb969787687099df703a4f4.tar.bz2 | |
Merge "Fix segv when unwinding stack past __libc_init."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/arch-arm/bionic/crtbegin_dynamic.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/arch-arm/bionic/crtbegin_dynamic.S b/libc/arch-arm/bionic/crtbegin_dynamic.S index 6ca0845..ec6d482 100644 --- a/libc/arch-arm/bionic/crtbegin_dynamic.S +++ b/libc/arch-arm/bionic/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__ |