Date: Sat, 2 Jan 2021 04:53:11 GMT From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8372f2f679e0 - stable/12 - Apply C SKEIN_LOOP setting only to skein_block.c Message-ID: <202101020453.1024rBOI095781@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8372f2f679e0f7a74c14810cdf93af52a783e68c commit 8372f2f679e0f7a74c14810cdf93af52a783e68c Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2020-06-05 17:00:38 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> CommitDate: 2021-01-02 04:52:23 +0000 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). (cherry picked from commit 310e81aede569411ad005f6d6e7259ae0cdafd82) --- lib/libmd/Makefile | 2 +- sys/modules/crypto/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index edeb308c82d6..2cb0e75f1d27 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -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} diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 09c5d710e985..7c34717597fd 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -29,7 +29,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101020453.1024rBOI095781>