summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kledzik <kledzik@apple.com>2011-09-27 20:05:27 +0000
committerNick Kledzik <kledzik@apple.com>2011-09-27 20:05:27 +0000
commitb69f3694df0d6592ffd2601d9428de08d9bac83e (patch)
treea5e33fccff96319f80bb2cb4c09bcb294074f423
parentbf415251dff4d9f4559a27b13dd4f25060b66f69 (diff)
downloadbcm5719-llvm-b69f3694df0d6592ffd2601d9428de08d9bac83e.tar.gz
bcm5719-llvm-b69f3694df0d6592ffd2601d9428de08d9bac83e.zip
<rdar://problem/10172492> No armv4t slice of libcompiler_rt-static.a
llvm-svn: 140630
-rw-r--r--compiler-rt/make/AppleBI.mk2
-rw-r--r--compiler-rt/make/platform/darwin_bni.mk3
2 files changed, 4 insertions, 1 deletions
diff --git a/compiler-rt/make/AppleBI.mk b/compiler-rt/make/AppleBI.mk
index c1b0974ebf1..96f8222c7b5 100644
--- a/compiler-rt/make/AppleBI.mk
+++ b/compiler-rt/make/AppleBI.mk
@@ -61,7 +61,7 @@ $(OBJROOT)/libcompiler_rt-%.dylib : $(OBJROOT)/darwin_bni/Release/%/libcompiler_
$(DYLIB_FLAGS) -Wl,-force_load,$^ -o $@
# Rule to make fat dylib
-$(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(RC_ARCHS), \
+$(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(filter-out armv4t,$(RC_ARCHS)), \
$(OBJROOT)/libcompiler_rt-$(arch).dylib)
$(call GetCNAVar,LIPO,Platform.darwin_bni,Release,) -create $^ -o $@
diff --git a/compiler-rt/make/platform/darwin_bni.mk b/compiler-rt/make/platform/darwin_bni.mk
index 8b61ab3207c..477e072de0a 100644
--- a/compiler-rt/make/platform/darwin_bni.mk
+++ b/compiler-rt/make/platform/darwin_bni.mk
@@ -67,6 +67,9 @@ FUNCTIONS.x86_64 := $(FUNCTIONS) \
muloti4 mulvti3 mulxc3 negti2 negvti2 parityti2 \
popcountti2 powixf2 subvti3 ucmpti2 udivmodti4 \
udivti3 umodti3 clear_cache enable_execute_stack
+
+FUNCTIONS.armv4t := $(FUNCTIONS)
+
FUNCTIONS.armv5 := $(FUNCTIONS) \
adddf3 addsf3 bswapdi2 bswapsi2 \
comparedf2 comparesf2 extendsfdf2 \
OpenPOWER on IntegriCloud