ARM: make CRT_LEGACY_WORKAROUND work as intended
To properly support legacy ARM shared libraries, libc.so needs
to export the symbols __dso_handle and atexit, even though
these are now supplied by the crt startup code.
This patch reshuffles the existing CRT_LEGACY_WORKAROUND
conditionally compiled code slightly so it works as the
original author likely intended.
Change-Id: Id6c0e94dc65b7928324a5f0bad7eba6eb2f464b9
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
diff --git a/libc/Android.mk b/libc/Android.mk
index 04301ef..f20e671 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -584,10 +584,6 @@
-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 := \
@@ -762,9 +758,6 @@
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
@@ -848,6 +841,17 @@
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