From fa3f72ee53ba79e41b78fa178ef8bb9372e2c084 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Mon, 5 Mar 2012 10:45:31 -0800
Subject: [PATCH] Revert "Reference __dso_handle in PIC way"

This reverts commit 93cb30813764b140f0adbaa620dcdbb1cae56dd8
---
 libc/arch-arm/bionic/crtbegin_so.S | 15 +++++++--------
 1 file 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__