Implement mulo<mode>4 for use in signed overflow checking.

Fixes rdar://9219742 and rdar://9218244


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@133284 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 19 insertions, 9 deletions

diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 99baacff3..4cbceee6c 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -42,6 +42,11 @@ UniversalArchs.10.4 := $(call CheckArches,i386 x86_64)
 Configs += ios
 UniversalArchs.ios := $(call CheckArches,i386 x86_64 armv6 armv7)
 
+# Configuration for targetting OSX. These functions may not be in libSystem
+# so we should provide our own.
+Configs += osx
+UniversalArchs.osx := $(call CheckArches,i386 x86_64)
+
 # Configuration for use with kernel/kexts.
 Configs += cc_kext
 UniversalArchs.cc_kext := $(call CheckArches,armv6 armv7 i386 x86_64)
@@ -74,6 +79,10 @@ 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.osx.i386         := $(CFLAGS) $(X86_DEPLOYMENT_ARGS)
+CFLAGS.osx.x86_64       := $(CFLAGS) $(X86_DEPLOYMENT_ARGS)
+CFLAGS.osx.armv6        := $(CFLAGS) $(ARM_DEPLOYMENT_ARGS)
+CFLAGS.osx.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
@@ -82,7 +91,7 @@ CFLAGS.cc_kext.armv7	:= $(CFLAGS) $(ARM_DEPLOYMENT_ARGS) -mthumb
 FUNCTIONS.eprintf := eprintf
 FUNCTIONS.10.4 := eprintf floatundidf floatundisf floatundixf
 
-FUNCTIONS.ios	    := divmodsi4 udivmodsi4
+FUNCTIONS.ios	    := divmodsi4 udivmodsi4 mulosi4 mulodi4 muloti4
 # On x86, the divmod functions reference divsi.
 FUNCTIONS.ios.i386   := $(FUNCTIONS.ios) \
                         divsi3 udivsi3
@@ -93,6 +102,8 @@ FUNCTIONS.ios.armv6 := $(FUNCTIONS.ios) \
                        switch16 switch32 switch8 switchu8 \
                        save_vfp_d8_d15_regs restore_vfp_d8_d15_regs
 
+FUNCTIONS.osx	:= mulosi4 mulodi4 muloti4
+
 CCKEXT_COMMON_FUNCTIONS := \
 	absvdi2 \
 	absvsi2 \
diff --git a/make/platform/darwin_bni.mk b/make/platform/darwin_bni.mk
index 14a1c197e..45a6879d1 100644
--- a/make/platform/darwin_bni.mk
+++ b/make/platform/darwin_bni.mk
@@ -1,7 +1,7 @@
 
 Description := Target for Darwin using an Apple-style build.
 
-Configs := Debug Release Profile Static 
+Configs := Debug Release Profile Static
 
 # We override this with RC_ARCHS because B&I may want to build on an ARCH we
 # haven't explicitly defined support for. If all goes well, this will just work
@@ -18,7 +18,7 @@ endif
 
 
 CFLAGS := -Wall -Os -fomit-frame-pointer -g
-CFLAGS.Static := $(CFLAGS) -static 
+CFLAGS.Static := $(CFLAGS) -static
 
 VISIBILITY_HIDDEN := 0
 VISIBILITY_HIDDEN.Static  := 1
@@ -29,8 +29,8 @@ FUNCTIONS := absvdi2 absvsi2 addvdi3 addvsi3 ashldi3 ashrdi3 \
              divdc3 divdi3 divsc3 ffsdi2 \
              fixdfdi fixsfdi fixunsdfdi fixunsdfsi fixunssfdi \
              fixunssfsi floatdidf floatdisf floatundidf floatundisf \
-             gcc_personality_v0 lshrdi3 moddi3 muldc3 muldi3 \
-             mulsc3 mulvdi3 mulvsi3 negdi2 negvdi2 negvsi2 \
+             gcc_personality_v0 lshrdi3 moddi3 muldc3 muldi3 mulosi3 \
+             mulodi3 muloti3 mulsc3 mulvdi3 mulvsi3 negdi2 negvdi2 negvsi2 \
              paritydi2 paritysi2 popcountdi2 popcountsi2 powidf2 \
              powisf2 subvdi3 subvsi3 ucmpdi2 udivdi3 \
              udivmoddi4 umoddi3 apple_versioning eprintf
@@ -51,7 +51,7 @@ FUNCTIONS.x86_64 := $(FUNCTIONS) \
                 fixunsxfti fixxfdi fixxfti floatdixf floattidf \
                 floattisf floattixf floatundixf floatuntidf \
                 floatuntisf floatuntixf lshrti3 modti3 multi3 \
-                mulvti3 mulxc3 negti2 negvti2 parityti2 \
+                muloti3 mulvti3 mulxc3 negti2 negvti2 parityti2 \
                 popcountti2 powixf2 subvti3 ucmpti2 udivmodti4 \
                 udivti3 umodti3 clear_cache enable_execute_stack
 FUNCTIONS.armv5 := $(FUNCTIONS) \
@@ -65,7 +65,7 @@ FUNCTIONS.armv5 := $(FUNCTIONS) \
                 truncdfsf2  \
                 modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4 \
                 switch8 switchu8 switch16 switch32 \
-                sync_synchronize 
+                sync_synchronize
 
 FUNCTIONS.armv6 := $(FUNCTIONS) \
 				comparedf2 comparesf2 \
@@ -81,7 +81,7 @@ FUNCTIONS.armv6 := $(FUNCTIONS) \
                 modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4 \
                 switch8 switchu8 switch16 switch32 \
                 restore_vfp_d8_d15_regs save_vfp_d8_d15_regs \
-                sync_synchronize 
+                sync_synchronize
 
 FUNCTIONS.armv7 := $(FUNCTIONS) \
 				comparedf2 comparesf2 \
@@ -95,4 +95,3 @@ FUNCTIONS.armv7 := $(FUNCTIONS) \
                 nedf2vfp nesf2vfp \
                 subdf3vfp subsf3vfp truncdfsf2vfp unorddf2vfp unordsf2vfp \
                 modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4
-