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

__on_dlclose should be aligned

Browse Source 
Marking segments read-only was pushing the alignment of __on_dlclose by
2 bytes making it unaligned. This change makes sure the ARM code is
aligned to the 4 byte boundary.

Bug: 6313309
Change-Id: Ic2bf475e120dd61225ec19e5d8a9a8b1d0b7f081
This commit is contained in:
Kenny Root 2012-04-10 17:24:24 -07:00
parent 7f03d2356f
commit 03273f8fc0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/Android.mk
View File

@ -514,8 +514,9 @@ libc_common_c_includes := \
# Needed to access private/__dso_handle.S from # Needed to access private/__dso_handle.S from
# crtbegin_xxx.S and crtend_xxx.S # crtbegin_xxx.S and crtend_xxx.S
# and machine/asm.h
# #
libc_crt_target_cflags += -I$(LOCAL_PATH)/private libc_crt_target_cflags += -I$(LOCAL_PATH)/private -I$(LOCAL_PATH)/arch-$(TARGET_ARCH)/include
# Define the libc run-time (crt) support object files that must be built, # Define the libc run-time (crt) support object files that must be built,
# which are needed to build all other objects (shared/static libs and # which are needed to build all other objects (shared/static libs and

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

@ -26,6 +26,10 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#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().
# #
@ -52,6 +56,8 @@ __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