diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-05 09:43:35 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-05 09:43:35 -0700 |
| commit | 26f2e4a1639a959513c4ff5981b4eb52757e8012 (patch) | |
| tree | f67c125011c1729fd3614304dd7428e6b1bfee22 /libc/Android.mk | |
| parent | 82978cae4eec238a9d631d2b61b8985daa02516e (diff) | |
| parent | f3cfcd869ded41d25c1f4f4e48e7c374a64f9583 (diff) | |
| download | bionic-26f2e4a1639a959513c4ff5981b4eb52757e8012.zip bionic-26f2e4a1639a959513c4ff5981b4eb52757e8012.tar.gz bionic-26f2e4a1639a959513c4ff5981b4eb52757e8012.tar.bz2 | |
Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 94cb3ea..837b5be 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -585,10 +585,6 @@ libc_crt_target_cflags += \ -I$(LOCAL_PATH)/include \ -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION) -ifeq ($(TARGET_ARCH),arm) - libc_crt_target_cflags += -DCRT_LEGACY_WORKAROUND -endif - # Define some common includes # ======================================================== libc_common_c_includes := \ @@ -763,9 +759,6 @@ 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_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -849,6 +842,17 @@ LOCAL_SRC_FILES := \ bionic/pthread_debug.c \ bionic/libc_init_dynamic.c +ifeq ($(TARGET_ARCH),arm) + LOCAL_NO_CRT := true + LOCAL_CFLAGS += -DCRT_LEGACY_WORKAROUND + + LOCAL_SRC_FILES := \ + arch-arm/bionic/crtbegin_so.c \ + arch-arm/bionic/atexit_legacy.c \ + $(LOCAL_SRC_FILES) \ + arch-arm/bionic/crtend_so.S +endif + LOCAL_MODULE:= libc LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |