svn commit: r336250 - in head: stand/libsa sys/conf sys/kern

[Warner Losh]

Author: imp
Date: Fri Jul 13 17:41:28 2018
New Revision: 336250
URL: https://svnweb.freebsd.org/changeset/base/336250

Log:
  There's two files in the sys tree named inflate.c, in addition
  to it being a common name elsewhere. Rename the old kzip one
  to subr_inflate.c.
  
  This actually fixes the build issues on sparc64 that my inclusion of
  .PATH ${SYSDIR}/kern created in r336244, so also revert the broken
  workaround I committed in r336249.
  
  This slipped passed me because apparently, I never did a clean build.

Added:
  head/sys/kern/subr_inflate.c   (contents, props changed)
     - copied, changed from r336249, head/sys/kern/inflate.c
Deleted:
  head/sys/kern/inflate.c
Modified:
  head/stand/libsa/Makefile
  head/sys/conf/Makefile.arm
  head/sys/conf/files

Modified: head/stand/libsa/Makefile
==============================================================================
--- head/stand/libsa/Makefile	Fri Jul 13 17:15:14 2018	(r336249)
+++ head/stand/libsa/Makefile	Fri Jul 13 17:41:28 2018	(r336250)
@@ -96,7 +96,6 @@ SRCS+=bzlib.c crctable.c decompress.c huffman.c randta
 # decompression functionality from zlib
 .PATH: ${SRCTOP}/contrib/zlib
 CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/contrib/zlib
-CFLAGS.inflate.c+=-DKZIP
 SRCS+=	adler32.c crc32.c
 SRCS+=	infback.c inffast.c inflate.c inftrees.c zutil.c
 

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Fri Jul 13 17:15:14 2018	(r336249)
+++ head/sys/conf/Makefile.arm	Fri Jul 13 17:41:28 2018	(r336250)
@@ -123,7 +123,7 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S
 	    echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h
 	${CC} -O2 -ffreestanding -I. -I$S -c \
 	    -DKZIP -DELF_TRAMPOLINE \
-	    $S/kern/inflate.c \
+	    $S/kern/subr_inflate.c \
 	    -o inflate-tramp.o
 	${CC} -O -nostdlib -I. -I$S \
 	    -Xlinker -T -Xlinker ldscript.$M.tramp \

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri Jul 13 17:15:14 2018	(r336249)
+++ head/sys/conf/files	Fri Jul 13 17:41:28 2018	(r336250)
@@ -3775,7 +3775,6 @@ kern/imgact_binmisc.c		optional	imagact_binmisc
 kern/imgact_elf.c		standard
 kern/imgact_elf32.c		optional compat_freebsd32
 kern/imgact_shell.c		standard
-kern/inflate.c			optional gzip
 kern/init_main.c		standard
 kern/init_sysent.c		standard
 kern/ksched.c			optional _kposix_priority_scheduling
@@ -3886,6 +3885,7 @@ kern/subr_firmware.c		optional firmware
 kern/subr_gtaskqueue.c		standard
 kern/subr_hash.c		standard
 kern/subr_hints.c		standard
+kern/subr_inflate.c		optional gzip
 kern/subr_kdb.c			standard
 kern/subr_kobj.c		standard
 kern/subr_lock.c		standard

Copied and modified: head/sys/kern/subr_inflate.c (from r336249, head/sys/kern/inflate.c)
==============================================================================