From owner-dev-commits-src-main@freebsd.org Thu Jan 7 11:05:56 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31CF54CCE1C; Thu, 7 Jan 2021 11:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBNh362jDz4tZ6; Thu, 7 Jan 2021 11:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B99037F82; Thu, 7 Jan 2021 11:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 107B5tI1011326; Thu, 7 Jan 2021 11:05:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 107B5tDG011325; Thu, 7 Jan 2021 11:05:55 GMT (envelope-from git) Date: Thu, 7 Jan 2021 11:05:55 GMT Message-Id: <202101071105.107B5tDG011325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: ed8455806e88 - main - Fix all warnings emitted in `make kernel-toolchain` MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed8455806e88deeb7151b9bb23ad5026a36d252d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2021 11:05:56 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=ed8455806e88deeb7151b9bb23ad5026a36d252d commit ed8455806e88deeb7151b9bb23ad5026a36d252d Author: Alex Richardson AuthorDate: 2021-01-06 17:51:03 +0000 Commit: Alex Richardson CommitDate: 2021-01-07 09:26:22 +0000 Fix all warnings emitted in `make kernel-toolchain` With this change and D27598 make kernel-toolchain no longer emits any warnings for me. Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D27599 --- bin/cat/cat.c | 6 +++++- tools/build/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 7668673f5e89..40d91b243bd4 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -74,7 +74,9 @@ static const char *filename; static void usage(void) __dead2; static void scanfiles(char *argv[], int cooked); +#ifndef BOOTSTRAP_CAT static void cook_cat(FILE *); +#endif static void raw_cat(int); #ifndef NO_UDOM_SUPPORT @@ -178,11 +180,13 @@ usage(void) } static void -scanfiles(char *argv[], int cooked) +scanfiles(char *argv[], int cooked __unused) { int fd, i; char *path; +#ifndef BOOTSTRAP_CAT FILE *fp; +#endif i = 0; fd = -1; diff --git a/tools/build/Makefile b/tools/build/Makefile index 01a29ad730af..ee9d9692df3b 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -105,9 +105,6 @@ INCS+= libcasper.h # not match. RPCINCS+= ${SRCTOP}/sys/rpc/types.h -.if ${.MAKE.OS} != "FreeBSD" -.PATH: ${.CURDIR}/cross-build - INCS+= ${SRCTOP}/include/mpool.h INCS+= ${SRCTOP}/include/ndbm.h INCS+= ${SRCTOP}/include/err.h @@ -143,6 +140,9 @@ INCS+= ${SRCTOP}/include/nlist.h SYSINCS+= ${SRCTOP}/sys/sys/imgact_aout.h SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h + +.if ${.MAKE.OS} != "FreeBSD" +.PATH: ${.CURDIR}/cross-build # dbopen() behaves differently on Linux and FreeBSD so we ensure that we # bootstrap the FreeBSD db code. The cross-build headers #define dbopen() to # __freebsd_dbopen() so that we don't ever use the host version