aboutsummaryrefslogtreecommitdiff
path: root/sys/conf/kern.mk
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2015-03-04 19:47:33 +0000
committerDimitry Andric <dim@FreeBSD.org>2015-03-04 19:47:33 +0000
commitca65be80fd770188b15b4aecdd245ddbeb7f46ed (patch)
treeb76068543cf8760cf057750c9cd4fdd7ab5834d4 /sys/conf/kern.mk
parent4104449570e3e74d77537f3a798fbdd632ad311c (diff)
parentfb64e73880228db0132e7001564d85d5e33a40ea (diff)
downloadsrc-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.tar.gz
src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.zip
Merge ^/head r279313 through r279595.
Notes
Notes: svn path=/projects/clang360-import/; revision=279596
Diffstat (limited to 'sys/conf/kern.mk')
-rw-r--r--sys/conf/kern.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 65babc589ca2..9a7ad618b515 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -133,7 +133,9 @@ INLINE_LIMIT?= 8000
# Also explicitly disable Altivec instructions inside the kernel.
#
.if ${MACHINE_CPUARCH} == "powerpc"
-CFLAGS+= -msoft-float -mno-altivec
+CFLAGS+= -mno-altivec
+CFLAGS.clang+= -mllvm -disable-ppc-float-in-variadic=true
+CFLAGS.gcc+= -msoft-float
INLINE_LIMIT?= 15000
.endif
@@ -141,7 +143,7 @@ INLINE_LIMIT?= 15000
# Use dot symbols on powerpc64 to make ddb happy
#
.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -mcall-aixdesc
+CFLAGS.gcc+= -mcall-aixdesc
.endif
#