aboutsummaryrefslogtreecommitdiff
path: root/make/platform
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2011-03-17 19:47:28 +0000
committerEd Schouten <ed@FreeBSD.org>2011-03-17 19:47:28 +0000
commitf170b6928b38a264ce005e5fa80d428364b6f659 (patch)
tree875c98489b0419eb321390a6093da33c5116f79a /make/platform
parent217b614317dad692116a3a06fe94ea8f61a59edb (diff)
downloadsrc-f170b6928b38a264ce005e5fa80d428364b6f659.tar.gz
src-f170b6928b38a264ce005e5fa80d428364b6f659.zip
Import compiler-rt r127823.vendor/compiler-rt/compiler-rt-r127823
Changes: - License change; now it's also dual licensed under the MIT licence. - Addition of divmodsi4 and udivmodsi4.
Notes
Notes: svn path=/vendor/compiler-rt/dist/; revision=219719 svn path=/vendor/compiler-rt/compiler-rt-r127823/; revision=219720; tag=vendor/compiler-rt/compiler-rt-r127823
Diffstat (limited to 'make/platform')
-rw-r--r--make/platform/clang_darwin.mk12
-rw-r--r--make/platform/darwin_bni.mk9
2 files changed, 10 insertions, 11 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 23cd3a42f86a..a29793991ebb 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -28,11 +28,7 @@ UniversalArchs.armv6 := armv6
# Configuration for use with kernel/kexts.
Configs += cc_kext
-UniversalArchs.cc_kext := armv6 i386 x86_64
-
-# FIXME: Don't build an armv7 slice currently, they have the same functions.
-#
-#UniversalArchs.cc_kext := armv6 armv7 i386 x86_64
+UniversalArchs.cc_kext := armv6 armv7 i386 x86_64
###
@@ -58,7 +54,6 @@ CCKEXT_COMMON_FUNCTIONS := \
ashrdi3 \
bswapdi2 \
bswapsi2 \
- clear_cache \
clzdi2 \
clzsi2 \
cmpdi2 \
@@ -105,7 +100,7 @@ CCKEXT_COMMON_FUNCTIONS := \
udivmoddi4 \
umoddi3
-CCKEXT_ARM_FUNCTIONS := $(CCKEXT_COMMON_FUNCTONS) \
+CCKEXT_ARM_FUNCTIONS := $(CCKEXT_COMMON_FUNCTIONS) \
adddf3 \
addsf3 \
aeabi_cdcmpeq \
@@ -164,6 +159,9 @@ CCKEXT_ARM_FUNCTIONS := $(CCKEXT_COMMON_FUNCTONS) \
FUNCTIONS.cc_kext.armv6 := $(CCKEXT_ARM_FUNCTIONS)
FUNCTIONS.cc_kext.armv7 := $(CCKEXT_ARM_FUNCTIONS)
+CFLAGS.cc_kext.armv6 := $(CFLAGS) -mthumb
+CFLAGS.cc_kext.armv7 := $(CFLAGS) -mthumb
+
CCKEXT_X86_FUNCTIONS := $(CCKEXT_COMMON_FUNCTIONS) \
divxc3 \
fixunsxfdi \
diff --git a/make/platform/darwin_bni.mk b/make/platform/darwin_bni.mk
index ec859f3b5d6e..f15334f31943 100644
--- a/make/platform/darwin_bni.mk
+++ b/make/platform/darwin_bni.mk
@@ -61,10 +61,10 @@ FUNCTIONS.armv5 := $(FUNCTIONS) \
muldf3 mulsf3 \
negdf2 negsf2 \
truncdfsf2 \
- modsi3 umodsi3 udivsi3 divsi3 \
+ modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4 \
switch8 switchu8 switch16 switch32 \
sync_synchronize
-
+
FUNCTIONS.armv6 := $(FUNCTIONS) \
comparedf2 comparesf2 \
adddf3vfp addsf3vfp bswapdi2 bswapsi2 divdf3vfp \
@@ -76,10 +76,11 @@ FUNCTIONS.armv6 := $(FUNCTIONS) \
muldf3vfp mulsf3vfp \
nedf2vfp nesf2vfp \
subdf3vfp subsf3vfp truncdfsf2vfp unorddf2vfp unordsf2vfp \
- modsi3 umodsi3 udivsi3 divsi3 \
+ modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4 \
switch8 switchu8 switch16 switch32 \
restore_vfp_d8_d15_regs save_vfp_d8_d15_regs \
sync_synchronize
+
FUNCTIONS.armv7 := $(FUNCTIONS) \
comparedf2 comparesf2 \
adddf3vfp addsf3vfp bswapdi2 bswapsi2 divdf3vfp \
@@ -91,5 +92,5 @@ FUNCTIONS.armv7 := $(FUNCTIONS) \
muldf3vfp mulsf3vfp \
nedf2vfp nesf2vfp \
subdf3vfp subsf3vfp truncdfsf2vfp unorddf2vfp unordsf2vfp \
- modsi3 umodsi3 udivsi3 divsi3
+ modsi3 umodsi3 udivsi3 divsi3 udivmodsi4 divmodsi4