svn commit: r339673 - head/stand/libsa

[Konstantin Belousov]

Author: kib
Date: Tue Oct 23 23:11:38 2018
New Revision: 339673
URL: https://svnweb.freebsd.org/changeset/base/339673

Log:
  Fix stand/ build after r339671.
  
  ffs_subr.c requires calculate_crc32c() from libkern.  Unfortunately we
  cannot just add libkern/crc32.c to libstand because crc32.o is already
  compiled from contrib/zlib/crc32.c. Use the include trick to rename
  the source.
  
  Note that libstand also provides crc32.c which seems to be unused.
  
  Reviewed by:	imp
  Sponsored by:	The FreeBSD Foundation
  Differential revision:	https://reviews.freebsd.org/D17677

Added:
  head/stand/libsa/crc32_libkern.c   (contents, props changed)
Modified:
  head/stand/libsa/Makefile

Modified: head/stand/libsa/Makefile
==============================================================================
--- head/stand/libsa/Makefile	Tue Oct 23 21:43:41 2018	(r339672)
+++ head/stand/libsa/Makefile	Tue Oct 23 23:11:38 2018	(r339673)
@@ -155,9 +155,9 @@ SRCS+=ffs_subr.c ffs_tables.c
 
 CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2
 
-# explicit_bzero
+# explicit_bzero and calculate_crc32c
 .PATH: ${SYSDIR}/libkern
-SRCS+=  explicit_bzero.c
+SRCS+=  explicit_bzero.c crc32_libkern.c
 
 # Maybe GELI
 .if ${MK_LOADER_GELI} == "yes"

Added: head/stand/libsa/crc32_libkern.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/stand/libsa/crc32_libkern.c	Tue Oct 23 23:11:38 2018	(r339673)
@@ -0,0 +1,3 @@
+/* $FreeBSD$ */
+
+#include "../../sys/libkern/crc32.c"