diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 55c7878b66e1..f5b7801c83f1 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -161,14 +161,12 @@ INLINE_LIMIT?=	8000
 # Also explicitly disable Altivec instructions inside the kernel.
 #
 .if ${MACHINE_CPUARCH} == "powerpc"
-CFLAGS+=	-mno-altivec
-CFLAGS.clang+=	-mllvm -disable-ppc-float-in-variadic=true
-CFLAGS.gcc+=	-msoft-float
+CFLAGS+=	-mno-altivec -msoft-float
 INLINE_LIMIT?=	15000
 .endif
 
 .if ${MACHINE_ARCH} == "powerpcspe"
-CFLAGS+=	-mno-spe
+CFLAGS.gcc+=	-mno-spe
 .endif
 
 #
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index eb33a5cc54f9..9c503f96420c 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -94,7 +94,7 @@ CFLAGS+=-I${SUNW}/common
 CFLAGS+=-DBUILDING_ZFS
 
 .if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+=-mminimal-toc
+CFLAGS.gcc+=-mminimal-toc
 .endif
 
 .ifdef ZFS_DEBUG