svn commit: r361845 - in head: lib/libmd sys/modules/crypto

[Ed Maste]

Author: emaste
Date: Fri Jun  5 18:56:43 2020
New Revision: 361845
URL: https://svnweb.freebsd.org/changeset/base/361845

Log:
  Also pass SKEIN_USE_ASM to the assembler, via AFLAGS

Modified:
  head/lib/libmd/Makefile
  head/sys/modules/crypto/Makefile

Modified: head/lib/libmd/Makefile
==============================================================================
--- head/lib/libmd/Makefile	Fri Jun  5 18:44:14 2020	(r361844)
+++ head/lib/libmd/Makefile	Fri Jun  5 18:56:43 2020	(r361845)
@@ -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

Modified: head/sys/modules/crypto/Makefile
==============================================================================
--- head/sys/modules/crypto/Makefile	Fri Jun  5 18:44:14 2020	(r361844)
+++ head/sys/modules/crypto/Makefile	Fri Jun  5 18:56:43 2020	(r361845)
@@ -34,7 +34,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