commit fa3f72ee53ba79e41b78fa178ef8bb9372e2c084
author Kenny Root <kroot@google.com> Mon Mar 05 10:45:31 2012 -0800
committer The Android Automerger <android-build@android.com> Mon Mar 05 11:55:23 2012 -0800
tree 70e376f699f4a354dd7135601d6b489af99665e0
parent fa944c190cd542c3f23f06e4bb4ec7d66997a916

Revert "Reference __dso_handle in PIC way"

This reverts commit 93cb30813764b140f0adbaa620dcdbb1cae56dd8

libc/arch-arm/bionic/crtbegin_so.S

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__