svn commit: r366362 - head/lib/libmd

[Ed Maste]

Author: emaste
Date: Fri Oct  2 14:00:52 2020
New Revision: 366362
URL: https://svnweb.freebsd.org/changeset/base/366362

Log:
  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

Modified:
  head/lib/libmd/Makefile

Modified: head/lib/libmd/Makefile
==============================================================================
--- head/lib/libmd/Makefile	Fri Oct  2 13:36:29 2020	(r366361)
+++ head/lib/libmd/Makefile	Fri Oct  2 14:00:52 2020	(r366362)
@@ -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