diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-06-05 18:56:43 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2021-01-02 04:52:23 +0000 |
| commit | 25a6b709b6b66800481249b5d27d3351636543ac (patch) | |
| tree | e3b61970f587974413a017f838c5ecd6429b2182 | |
| parent | 8372f2f679e0f7a74c14810cdf93af52a783e68c (diff) | |
| download | src-25a6b709b6b66800481249b5d27d3351636543ac.tar.gz src-25a6b709b6b66800481249b5d27d3351636543ac.zip | |
Also pass SKEIN_USE_ASM to the assembler, via AFLAGS
(cherry picked from commit f2b86886645fc3fa331543565268808b80d5abdb)
| -rw-r--r-- | lib/libmd/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/crypto/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 2cb0e75f1d27..2381d6da9e93 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -120,7 +120,7 @@ CFLAGS+= -DRMD160_ASM .if defined(XAS) || ${MK_BINUTILS_BOOTSTRAP} != "no" AFLAGS += --strip-local-absolute # Fully unroll all loops in the assembly optimized version -AFLAGS+= --defsym SKEIN_LOOP=0 +AFLAGS+= --defsym SKEIN_LOOP=0 --defsym SKEIN_USE_ASM=1792 SRCS+= skein_block_asm.s CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 .else diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 7c34717597fd..4762b9250e9c 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -36,7 +36,7 @@ SRCS += skein_block_asm.s CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 ACFLAGS += -DELF -Wa,--noexecstack # Fully unroll all loops in the assembly optimized version -AFLAGS+= --defsym SKEIN_LOOP=0 +AFLAGS+= --defsym SKEIN_LOOP=0 --defsym SKEIN_USE_ASM=1792 .endif SRCS += siphash.c SRCS += gmac.c gfmult.c |