From e52a2dc83cbc674c3f009634913453fe1d0408d0 Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 27 Feb 2015 20:32:50 +0000
Subject: [PATCH] Use appropriate alternative to -msoft-float for clang-built
 PowerPC kernels.

---
 sys/conf/kern.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 340da8c83fa0..50eaee5b9ee7 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -131,7 +131,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
 
@@ -139,7 +141,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
 
 #