The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=091a037cb69c0f234edb2333875f44b35f1adf1d
commit 091a037cb69c0f234edb2333875f44b35f1adf1d Author: Toomas Soome <[email protected]> AuthorDate: 2020-08-26 17:52:32 +0000 Commit: Kyle Evans <[email protected]> CommitDate: 2021-10-08 05:24:27 +0000 libsa: only skein_block.c is using SKEIN_LOOP Only use SKEIN_LOOP while compiling skein_block.c (cherry picked from commit 0fec8f03cf996be5d4c9d770a7c47aae5e5aaee8) --- stand/libsa/zfs/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 5e4e2d455c83..4212e2b40b93 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -2,8 +2,6 @@ .PATH: ${ZFSSRC} SRCS+= zfs.c nvlist.c skein.c skein_block.c list.c -# Do not unroll skein loops, reduce code size -CFLAGS+= -DSKEIN_LOOP=111 .PATH: ${SYSDIR}/crypto/skein .PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/common/os @@ -12,6 +10,8 @@ CFLAGS+= -I${SYSDIR}/cddl/boot/zfs CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${SYSDIR}/crypto/skein +# Do not unroll skein loops, reduce code size +CFLAGS.skein_block.c+= -DSKEIN_LOOP=111 CFLAGS.zfs.c+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 CFLAGS+= -Wformat -Wall
