diff options
| author | Nick Kledzik <kledzik@apple.com> | 2011-09-27 20:05:27 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2011-09-27 20:05:27 +0000 |
| commit | a11b52f4527d2b3f0a9ac10c9aa7a67aa1ff8272 (patch) | |
| tree | 2162bb896347300117bdeebd41b0bb31f4f15ba8 /make | |
| parent | 8ef083003fe24fe2b3e8e35c03f4039c45bc46aa (diff) | |
<rdar://problem/10172492> No armv4t slice of libcompiler_rt-static.a
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@140630 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
| -rw-r--r-- | make/AppleBI.mk | 2 | ||||
| -rw-r--r-- | make/platform/darwin_bni.mk | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/make/AppleBI.mk b/make/AppleBI.mk index c1b0974eb..96f8222c7 100644 --- a/make/AppleBI.mk +++ b/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/make/platform/darwin_bni.mk b/make/platform/darwin_bni.mk index 8b61ab320..477e072de 100644 --- a/make/platform/darwin_bni.mk +++ b/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 \ |