diff options
| author | Bruce Beare <bruce.j.beare@intel.com> | 2011-06-20 10:29:50 -0700 |
|---|---|---|
| committer | Bruce Beare <bruce.j.beare@intel.com> | 2011-06-20 14:44:44 -0700 |
| commit | 39640842823ba4cd42bd11514c0da39aa939519f (patch) | |
| tree | c2cddf3319145716533bc9d12ad1d6bb5c047f59 /libc/Android.mk | |
| parent | 4d9b75a9b08c19cef81b22f889edba61257fb356 (diff) | |
| download | bionic-39640842823ba4cd42bd11514c0da39aa939519f.zip bionic-39640842823ba4cd42bd11514c0da39aa939519f.tar.gz bionic-39640842823ba4cd42bd11514c0da39aa939519f.tar.bz2 | |
Enable functional DSO object destruction
Unfortunately, legacy .so files for ARM don't have a correct crtbegin file.
Consequently, we have to grandfather the old __dso_handle behaviour.
Add some ifdefs for ARM to allow it to use the old code until we can work
out a transition.
Change-Id: I6a28f368267d792c94e1d985d8344023bc632f6f
Author: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 033c273..f59fe43 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -522,6 +522,10 @@ endif # libc_crt_target_cflags += -I$(LOCAL_PATH)/private +ifeq ($(TARGET_ARCH),arm) +libc_crt_target_cflags += -DCRT_LEGACY_WORKAROUND +endif + # Define some common includes # ======================================================== libc_common_c_includes := \ @@ -597,6 +601,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libc_common_src_files) LOCAL_CFLAGS := $(libc_common_cflags) +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -DCRT_LEGACY_WORKAROUND +endif LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_MODULE := libc_common LOCAL_SYSTEM_SHARED_LIBRARIES := |