[llvm-commits] [compiler-rt] r140630 - in /compiler-rt/trunk/make: AppleBI.mk platform/darwin_bni.mk

[Nick Kledzik]

Author: kledzik
Date: Tue Sep 27 15:05:27 2011
New Revision: 140630

URL: http://llvm.org/viewvc/llvm-project?rev=140630&view=rev
Log:
<rdar://problem/10172492> No armv4t slice of libcompiler_rt-static.a

Modified:
    compiler-rt/trunk/make/AppleBI.mk
    compiler-rt/trunk/make/platform/darwin_bni.mk

Modified: compiler-rt/trunk/make/AppleBI.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/AppleBI.mk?rev=140630&r1=140629&r2=140630&view=diff
==============================================================================
--- compiler-rt/trunk/make/AppleBI.mk (original)
+++ compiler-rt/trunk/make/AppleBI.mk Tue Sep 27 15:05:27 2011
@@ -61,7 +61,7 @@
 	   $(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  $@
 

Modified: compiler-rt/trunk/make/platform/darwin_bni.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/darwin_bni.mk?rev=140630&r1=140629&r2=140630&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/darwin_bni.mk (original)
+++ compiler-rt/trunk/make/platform/darwin_bni.mk Tue Sep 27 15:05:27 2011
@@ -67,6 +67,9 @@
                 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 \