From 470835b215c14aa5ff2368527feeff35bfb46a90 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 11 Apr 2012 14:16:04 -0700 Subject: [PATCH] Move end of __on_dlclose up The END macro was put too far down which made the linker complain about it. Move up to the end of the code. Change-Id: Ica71a9c6083b437d2213c7cefe34b0083c78f16b --- libc/arch-arm/bionic/crtbegin_so.S | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libc/arch-arm/bionic/crtbegin_so.S b/libc/arch-arm/bionic/crtbegin_so.S index a54ed0d15..104d2144b 100644 --- a/libc/arch-arm/bionic/crtbegin_so.S +++ b/libc/arch-arm/bionic/crtbegin_so.S @@ -28,8 +28,6 @@ #include -ENTRY(__on_dlclose) - # Implement static C++ destructors when the shared # library is unloaded through dlclose(). # @@ -37,10 +35,11 @@ ENTRY(__on_dlclose) # 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 @@ __FINI_ARRAY__: .long -1 .long __on_dlclose -END(__on_dlclose) - #ifdef CRT_LEGACY_WORKAROUND #include "__dso_handle.S" #else