summaryrefslogtreecommitdiffstats
path: root/sys/conf/kern.mk
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-03-04 19:47:33 +0000
committerdim <dim@FreeBSD.org>2015-03-04 19:47:33 +0000
commitc00aebe66513aba0a00dc82f99b3895df3877909 (patch)
treeb76068543cf8760cf057750c9cd4fdd7ab5834d4 /sys/conf/kern.mk
parent21319e8ca544f3244b9e7dded4fb9f9619df5e81 (diff)
parent03939e42e68cd44a8cc42503cb35e7fad919b2cc (diff)
downloadFreeBSD-src-c00aebe66513aba0a00dc82f99b3895df3877909.zip
FreeBSD-src-c00aebe66513aba0a00dc82f99b3895df3877909.tar.gz
Merge ^/head r279313 through r279595.
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 65babc5..9a7ad61 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
#
OpenPOWER on IntegriCloud