[llvm-commits] [compiler-rt] r130566 - /compiler-rt/trunk/make/platform/clang_darwin.mk

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 29 20:20:56 2011
New Revision: 130566

URL: http://llvm.org/viewvc/llvm-project?rev=130566&view=rev
Log:
clang/Darwin: Update ios static lib to build for all archs, in case the
simulator wants to use it.

Modified:
    compiler-rt/trunk/make/platform/clang_darwin.mk

Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=130566&r1=130565&r2=130566&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
+++ compiler-rt/trunk/make/platform/clang_darwin.mk Fri Apr 29 20:20:56 2011
@@ -25,7 +25,7 @@
 # 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 @@
 
 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 @@
 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 \