commit 21372896ea0f13938c130c8c82cdc3a6b9ccd297
author Elliott Hughes <enh@google.com> Tue Jul 31 10:31:20 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue Jul 31 10:31:20 2012 -0700
tree fdd94f6c62d3006ee5f0eb17b5c843a16c93ea55
parent 1ee6e3b7370b36ac72a14c0e31c34963b1bdbbb2
parent 2270dfa0c418ab06e89412ea7b4ffe650490bcc9

Merge "fix __cxa_finalize() implementation to be thread safe."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 4ceb12f..1a5bdfa 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -589,6 +589,18 @@
 	@mkdir -p $(dir $@)
 	$(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
 ALL_GENERATED_SOURCES += $(GEN)
+
+GEN := $(TARGET_OUT_SHARED_LIBRARIES)/crtbegin_so.o
+$(GEN): $(libc_crt_target_crtstart_so_file)
+	@mkdir -p $(dir $@)
+	$(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
+ALL_GENERATED_SOURCES += $(GEN)
+
+GEN := $(TARGET_OUT_SHARED_LIBRARIES)/crtend_so.o
+$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend_so.S
+	@mkdir -p $(dir $@)
+	$(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
+ALL_GENERATED_SOURCES += $(GEN)
 endif # TARGET_ARCH == x86 || TARGET_ARCH == arm