diff options
| author | Kenny Root <kroot@google.com> | 2012-03-05 10:45:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-05 10:45:31 -0800 |
| commit | be101bf39aaaaaee3a96d62fbc4c1136548480de (patch) | |
| tree | af2003dd9e75b71015e03dbf4d5e64fe285c3740 /libc/arch-arm | |
| parent | 93cb30813764b140f0adbaa620dcdbb1cae56dd8 (diff) | |
| download | bionic-be101bf39aaaaaee3a96d62fbc4c1136548480de.zip bionic-be101bf39aaaaaee3a96d62fbc4c1136548480de.tar.gz bionic-be101bf39aaaaaee3a96d62fbc4c1136548480de.tar.bz2 | |
Revert "Reference __dso_handle in PIC way"
This reverts commit 93cb30813764b140f0adbaa620dcdbb1cae56dd8
Diffstat (limited to 'libc/arch-arm')
| -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 8123254..9275b1e 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__ |