svn commit: r327738 - head/sys/conf

[Conrad Meyer]

Author: cem
Date: Tue Jan  9 20:53:30 2018
New Revision: 327738
URL: https://svnweb.freebsd.org/changeset/base/327738

Log:
  Fix Zstd x86 kernel build with -march=<specific>
  
  Disable Zstd experimental support for __BMI__ intrinsics, when built with
  -march=foo supporting such intrinsics, to avoid attempting to include
  immintrin.h.  If a later Zstd marks the support non-experimental, we may want
  to revisit this approach.
  
  Submitted by:	jkim
  Reported by:	jkim, "Oliver Hartmann" <ohartmann AT walstatt.org>

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Tue Jan  9 20:35:58 2018	(r327737)
+++ head/sys/conf/kern.pre.mk	Tue Jan  9 20:53:30 2018	(r327738)
@@ -133,7 +133,7 @@ NORMAL_FWO= ${LD} -b binary --no-warn-mismatch -d -war
 	-m ${LD_EMULATION} -o ${.TARGET} ${.ALLSRC:M*.fw}
 
 # for ZSTD in the kernel (include zstd/lib/freebsd before other CFLAGS)
-ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} -I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} -Wno-inline -Wno-missing-prototypes ${PROF} ${.IMPSRC}
+ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} -I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} -Wno-inline -Wno-missing-prototypes ${PROF} -U__BMI__ ${.IMPSRC}
 
 # Common for dtrace / zfs
 CDDL_CFLAGS=	-DFREEBSD_NAMECACHE -nostdinc -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common -I$S -I$S/cddl/contrib/opensolaris/common ${CFLAGS} -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch -Wno-pointer-arith -Wno-unknown-pragmas