generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move end of __on_dlclose up

Browse Source 
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
This commit is contained in:
Kenny Root 2012-04-11 14:16:04 -07:00
parent 03273f8fc0
commit 470835b215
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/arch-arm/bionic/crtbegin_so.S
View File

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