svn commit: r313005 - in head/sys: conf modules/zfs

[Justin Hibbits]

Author: jhibbits
Date: Tue Jan 31 01:55:29 2017
New Revision: 313005
URL: https://svnweb.freebsd.org/changeset/base/313005

Log:
  Update CFLAGS for clang compatibility
  
  * Clang/llvm does not (yet) support -m(no-)spe, so make it gcc-only
  * Clang now supports -msoft-float, and does not appear to recognize
    "-disable-ppc-float-in-variadic", which appears to have been a crutch until
    soft-float was implemented.  It's now implemented for both 32- and 64-bit.
  * Clang/llvm use a 'medium' code model by default for powerpc64, supporting up
    to 4GB TOC, and does not support the '-mminimal-toc' option.  Given both of
    these, make -mminimal-toc gcc-only.
  
  MFC after:	2 weeks

Modified:
  head/sys/conf/kern.mk
  head/sys/modules/zfs/Makefile

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Tue Jan 31 01:48:55 2017	(r313004)
+++ head/sys/conf/kern.mk	Tue Jan 31 01:55:29 2017	(r313005)
@@ -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
 
 #

Modified: head/sys/modules/zfs/Makefile
==============================================================================
--- head/sys/modules/zfs/Makefile	Tue Jan 31 01:48:55 2017	(r313004)
+++ head/sys/modules/zfs/Makefile	Tue Jan 31 01:55:29 2017	(r313005)
@@ -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