Author: emaste
Date: Fri Jun 5 17:00:38 2020
New Revision: 361840
URL: https://svnweb.freebsd.org/changeset/base/361840
Log:
Apply C SKEIN_LOOP setting only to skein_block.c
Otherwise if assembling skein_block_asm.s with Clang's integrated assembler
we can pass conflicting SKEIN_LOOP settings (via CFLAGS and ACFLAGS).
Modified:
head/lib/libmd/Makefile
head/sys/modules/crypto/Makefile
Modified: head/lib/libmd/Makefile
==============================================================================
--- head/lib/libmd/Makefile Fri Jun 5 16:59:14 2020 (r361839)
+++ head/lib/libmd/Makefile Fri Jun 5 17:00:38 2020 (r361840)
@@ -97,7 +97,7 @@ CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/crypto/sha2
CFLAGS+= -I${SRCTOP}/sys/crypto/skein
CFLAGS+= -DWEAK_REFS
# unroll the 256 and 512 loops, half unroll the 1024
-CFLAGS+= -DSKEIN_LOOP=995
+CFLAGS.skein_block.c+= -DSKEIN_LOOP=995
.PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2
.PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
Modified: head/sys/modules/crypto/Makefile
==============================================================================
--- head/sys/modules/crypto/Makefile Fri Jun 5 16:59:14 2020
(r361839)
+++ head/sys/modules/crypto/Makefile Fri Jun 5 17:00:38 2020
(r361840)
@@ -27,7 +27,7 @@ SRCS += des_ecb.c des_enc.c des_setkey.c
SRCS += sha1.c sha256c.c sha512c.c
SRCS += skein.c skein_block.c
# unroll the 256 and 512 loops, half unroll the 1024
-CFLAGS+= -DSKEIN_LOOP=995
+CFLAGS.skein_block.c += -DSKEIN_LOOP=995
.if exists(${MACHINE_ARCH}/skein_block_asm.s)
.PATH: ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
SRCS += skein_block_asm.s
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
