commit f0a9d98a3995d899a184e5fdc79d188f2e38b8de
author The Android Automerger <android-build@android.com> Thu Apr 12 06:59:24 2012 -0700
committer The Android Automerger <android-build@android.com> Thu Apr 12 06:59:24 2012 -0700
tree 0d35e1462a36051bf0ab5850b981c54a6ed68c97
parent 470835b215c14aa5ff2368527feeff35bfb46a90
parent 85611165ab9f169dfb8580ad01a22c472287b745

merge in jb-release history after reset to master

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 a54ed0d..104d214 100644
--- a/libc/arch-arm/bionic/crtbegin_so.S
+++ b/libc/arch-arm/bionic/crtbegin_so.S
@@ -28,8 +28,6 @@
 
 #include <machine/asm.h>
 
-ENTRY(__on_dlclose)
-
 # Implement static C++ destructors when the shared
 # library is unloaded through dlclose().
 #
@@ -37,10 +35,11 @@
 # in the .fini_array. See 3.3.5.3.C of C++ ABI
 # standard.
 #
-__on_dlclose:
+ENTRY(__on_dlclose)
         adr     r0, 0f
         ldr     r0, [r0]
         b       __cxa_finalize
+END(__on_dlclose)
 
 0:
         .long   __dso_handle
@@ -56,8 +55,6 @@
         .long -1
         .long __on_dlclose
 
-END(__on_dlclose)
-
 #ifdef CRT_LEGACY_WORKAROUND
 #include "__dso_handle.S"
 #else