diff options
| author | Kenny Root <kroot@google.com> | 2012-03-05 10:46:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-05 10:46:01 -0800 |
| commit | 45976873353d05b44f23fa53cbcd793b22927820 (patch) | |
| tree | 70e376f699f4a354dd7135601d6b489af99665e0 | |
| parent | 1fe109ecf3b1acd10d55091f3e0eed7efeca98f1 (diff) | |
| parent | be101bf39aaaaaee3a96d62fbc4c1136548480de (diff) | |
| download | android_bionic-45976873353d05b44f23fa53cbcd793b22927820.tar.gz android_bionic-45976873353d05b44f23fa53cbcd793b22927820.tar.bz2 android_bionic-45976873353d05b44f23fa53cbcd793b22927820.zip | |
Merge "Revert "Reference __dso_handle in PIC way""
| -rw-r--r-- | libc/arch-arm/bionic/crtbegin_so.S | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libc/arch-arm/bionic/crtbegin_so.S b/libc/arch-arm/bionic/crtbegin_so.S index 8123254ea..9275b1e01 100644 --- a/libc/arch-arm/bionic/crtbegin_so.S +++ b/libc/arch-arm/bionic/crtbegin_so.S @@ -34,18 +34,17 @@ # standard. # __on_dlclose: - ldr r0, .L1 -.LPIC0: - add r0, pc + adr r0, 0f ldr r0, [r0] b __cxa_finalize -.L1: - .word __dso_handle-(.LPIC0+4) - .section .init_array, "aw" - .globl __INIT_ARRAY__ +0: + .long __dso_handle + + .section .init_array, "aw" + .globl __INIT_ARRAY__ __INIT_ARRAY__: - .long -1 + .long -1 .section .fini_array, "aw" .globl __FINI_ARRAY__ |