From owner-svn-src-all@freebsd.org Fri Jul 13 17:41:29 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEEFD1045BF6; Fri, 13 Jul 2018 17:41:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FFD970766; Fri, 13 Jul 2018 17:41:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 381B21357F; Fri, 13 Jul 2018 17:41:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6DHfTEp017134; Fri, 13 Jul 2018 17:41:29 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6DHfSAa016950; Fri, 13 Jul 2018 17:41:28 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807131741.w6DHfSAa016950@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 13 Jul 2018 17:41:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336250 - in head: stand/libsa sys/conf sys/kern X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: stand/libsa sys/conf sys/kern X-SVN-Commit-Revision: 336250 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2018 17:41:30 -0000 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) ==============================================================================