diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-04-30 01:20:56 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-04-30 01:20:56 +0000 |
| commit | a14b7219a3fbfa3ca0d699db0919f51a762689e2 (patch) | |
| tree | 1fca945b2824c13c91db49c2969aed3225a15b45 | |
| parent | 3d8090e3400bcedb99e7b5b2471d53d9c7d74e8a (diff) | |
| download | compiler-rt-a14b7219a3fbfa3ca0d699db0919f51a762689e2.tar.gz | |
clang/Darwin: Update ios static lib to build for all archs, in case the
simulator wants to use it.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@130566 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | make/platform/clang_darwin.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk index 4ad4f22fd..9345ff451 100644 --- a/make/platform/clang_darwin.mk +++ b/make/platform/clang_darwin.mk @@ -25,7 +25,7 @@ UniversalArchs.10.4 := i386 x86_64 # in the same linkage unit, and for a couple of other functions that didn't # make it into libSystem. Configs += ios -UniversalArchs.ios := armv6 armv7 +UniversalArchs.ios := i386 x86_64 armv6 armv7 # Configuration for use with kernel/kexts. Configs += cc_kext @@ -55,7 +55,10 @@ endif CFLAGS.eprintf := $(CFLAGS) $(X86_DEPLOYMENT_ARGS) CFLAGS.10.4 := $(CFLAGS) $(X86_DEPLOYMENT_ARGS) -CFLAGS.ios := $(CFLAGS) $(ARM_DEPLOYMENT_ARGS) +CFLAGS.ios.i386 := $(CFLAGS) $(X86_DEPLOYMENT_ARGS) +CFLAGS.ios.x86_64 := $(CFLAGS) $(X86_DEPLOYMENT_ARGS) +CFLAGS.ios.armv6 := $(CFLAGS) $(ARM_DEPLOYMENT_ARGS) +CFLAGS.ios.armv7 := $(CFLAGS) $(ARM_DEPLOYMENT_ARGS) CFLAGS.cc_kext.i386 := $(CFLAGS) $(X86_DEPLOYMENT_ARGS) CFLAGS.cc_kext.x86_64 := $(CFLAGS) $(X86_DEPLOYMENT_ARGS) CFLAGS.cc_kext.armv6 := $(CFLAGS) $(ARM_DEPLOYMENT_ARGS) -mthumb @@ -64,12 +67,11 @@ CFLAGS.cc_kext.armv7 := $(CFLAGS) $(ARM_DEPLOYMENT_ARGS) -mthumb FUNCTIONS.eprintf := eprintf FUNCTIONS.10.4 := eprintf floatundidf floatundisf floatundixf -IOS_COMMON_FUNCTIONS := divmodsi4 udivmodsi4 -FUNCTIONS.ios.armv6 := $(IOS_COMMON_FUNCTIONS) \ +FUNCTIONS.ios := divmodsi4 udivmodsi4 +FUNCTIONS.ios.armv6 := $(FUNCTIONS.ios) \ sync_synchronize \ switch16 switch32 switch8 switchu8 \ save_vfp_d8_d15_regs restore_vfp_d8_d15_regs -FUNCTIONS.ios.armv7 := $(IOS_COMMON_FUNCTIONS) CCKEXT_COMMON_FUNCTIONS := \ absvdi2 \ |