From b69f3694df0d6592ffd2601d9428de08d9bac83e Mon Sep 17 00:00:00 2001 From: Nick Kledzik Date: Tue, 27 Sep 2011 20:05:27 +0000 Subject: [PATCH] No armv4t slice of libcompiler_rt-static.a llvm-svn: 140630 --- compiler-rt/make/AppleBI.mk | 2 +- compiler-rt/make/platform/darwin_bni.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler-rt/make/AppleBI.mk b/compiler-rt/make/AppleBI.mk index c1b0974ebf1a..96f8222c7b5c 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 8b61ab3207cc..477e072de0a0 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 \ -- GitLab