From da6e5efe925e4d167d788b98bf5c72326f953801 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 2 Oct 2020 14:00:52 +0000 Subject: [PATCH] libmd: add dependency workaround for r366344 r366344 fixed and reenabled the assembly optimized skein implementation, but skein_block objects were not being rebuilt in no-clean builds. This resulted in failing no-clean builds. SKEIN_USE_ASM controls which routines come from C vs assembly, and with no explicit dependency r366344's change to SKEIN_USE_ASM did not cause skein_block.{o,pico} to be rebuilt. Add a dependency on this Makefile for the skein_block objects. This dependency is broader in scope than absolutely required (that is, the skein_block objects will now be rebuilt on any change to this Makefile). There are ways this could be addressed, but it is probably not worth the additional effort or testing time to pursue them. PR: 248221 Reported by: kevans, Jeremy Faulkner Discussed with: kevans Sponsored by: The FreeBSD Foundation --- lib/libmd/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index e001bb428d3c..f90101112ba9 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -121,6 +121,10 @@ CFLAGS+= -DRMD160_ASM ACFLAGS+= -DSKEIN_LOOP=0 SRCS+= skein_block_asm.S CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 +# 20201002 Add explict Makefile dependency for r366344 (reenabled assembly +# optimized version). SKEIN_USE_ASM determines which routines should come from +# the assembly vs C versions, and skein_block needs to be rebuilt if it changes. +skein_block.o skein_block.pico: Makefile .endif .if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || exists(${MACHINE_ARCH}/skein_block_asm.S) ACFLAGS+= -DELF -Wa,--noexecstack