Author: imp
Date: Tue Oct 13 04:37:57 2020
New Revision: 366660
URL: https://svnweb.freebsd.org/changeset/base/366660
Log:
Force __BMI__ experimental instructions off.
The OpenZFS code that uses the BMI instructions is broken. Forcibly
disable them to prevent their use. When enabled, the build breaks.
This fixes the build when compiled for a core with BMI instructions.
This is the same fix committed in r364777, for the same issue.
Submitted by: Jung-uk Kim
Modified:
head/stand/libsa/zfs/Makefile.inc
Modified: head/stand/libsa/zfs/Makefile.inc
==============================================================================
--- head/stand/libsa/zfs/Makefile.inc Tue Oct 13 03:49:12 2020
(r366659)
+++ head/stand/libsa/zfs/Makefile.inc Tue Oct 13 04:37:57 2020
(r366660)
@@ -31,6 +31,7 @@ CFLAGS_EARLY.zstd_shim.c+= ${ZFS_EARLY}
CFLAGS.nvlist.c+= -I${ZFSOSINC}/spl
CFLAGS.zfs.c+= -I${ZFSOSINC}/spl \
-I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4
+CFLAGS.zstd.c+= -U__BMI__
CFLAGS.zstd_shim.c+= -DIN_BASE -I${OZFS}/include
# Do not unroll skein loops, reduce code size
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
