From nobody Wed Jun 3 15:03:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gVrYH3H9tz6g29S for ; Wed, 03 Jun 2026 15:03:15 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVrYH1cBSz3dyZ for ; Wed, 03 Jun 2026 15:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780498995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWHcOZNiDI66s0uZ3kr1FmjTKQK+Kho2/+KLOXZ8MZU=; b=Z56GiUjv7h5lA2x4wWuTVyryVJgdhUFZ9UPp56ivbEMCRIKre0sKxTPDY98HqwWNs3+WDZ nPP08jc0eq8oJD8JegISCELiKdfj3Q7UA/793vZnZ06hwqmXP2Aoa3N92HLtsax3zNe7GQ I3GCQ3WDCP2TwDXF2hIM/JrZCKv2As9JRODQegDSxk6yFnHYQeUDwYJpEimuAi3zrCQQ5Y nsLW8e6yOHStaizIUF+Q6KdKM64yvVIb8pkxoCdH4FjCnQJFKue65Vb4dJAJrxbLARgizs 0XmxtMJ1FDFI/11lpN7rZDezyC5Cn0kenpLePvdLEfrcYjgkp76w0Akyg9NK+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780498995; a=rsa-sha256; cv=none; b=kqiYv2/r+0AB3j23M9yuOdsFntlh12dMwMa1MEGasV/Lhs78hgwEXcnVSIa3NWyxkZUK3x UfDRD6ZP6TpKcQjsNnDgfqA4ziI9VWrQPQJFKSMRkamMNYkXteXRfdNYh82Zr4Z00ZYaYq BbLaVkR0xXokwhFtjF3G69NfWwXNf3Oaek0Avm+xviJRvNKb/vzif6xkjl/YtsL/f1ilWR OWuaPWKDkkDZ50Up1TZU0d0Xd03arny96DXv3ELTlKSeFBfOynCQxXVM2cSQqMSYNj21HH Is/hnJRpiTVkXc43HIrTo4/mWz/4jpAuf78qt5+AeIiUW0Y91d63FOdNXCcWLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780498995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWHcOZNiDI66s0uZ3kr1FmjTKQK+Kho2/+KLOXZ8MZU=; b=Jg+M6lQjvYSeVWPWcVVnkg0qBQ102t11rRMBX44va2TWejQx/NC1gfATBzAC/Y32NeppRl crvkB4p7MtR/iyMe90k9TeH6fDsoFJJBoXDwvypuyRKi9Qp0tD/r5yFz7UocP6WWC+U8J3 dQ+1PXqqoaV1kwpY7/J2nOkJK/uGAPOqCzgXx8SJZvcd5vRtPbG5HJQh3plxn/YhhcJIcq H9mBZ7tWxxWeoxpOmQPVk0AM26v3yxs9cSedpANIvOfHxKdvpgiQAt8zQs/b32pOs99AFG 0sm7p528mmFmndR3qYFOmGg5nBj/v5zN3XXj+z+++X4kAStKF00JPJbuTInIrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVrYH1CKLz1yF for ; Wed, 03 Jun 2026 15:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e000 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 15:03:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ce243df20aa8 - main - i386: Fix build (of 'genassym.o') List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce243df20aa8ba94918cafdca2537c8cd18887c8 Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 15:03:15 +0000 Message-Id: <6a204233.3e000.143a4ec1@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ce243df20aa8ba94918cafdca2537c8cd18887c8 commit ce243df20aa8ba94918cafdca2537c8cd18887c8 Author: Olivier Certner AuthorDate: 2026-06-03 13:11:52 +0000 Commit: Olivier Certner CommitDate: 2026-06-03 15:02:39 +0000 i386: Fix build (of 'genassym.o') i386's genassym.c needs to define some assembly symbols holding the size of NFS structures to support NFS_ROOT while booting with a nfs_diskless structure. For this, it needs to include a few NFS headers, which require definitions from (fhandle_t, vfs_init_t), which was removed by commit 72ab129799a2 ("x86: remove sys/mount.h from genassym.c"). Since recently, has been including , so needs "vnode_if.h" to have been generated for the compilation of 'genassym.o' not to fail. Make sure this is the case (for all architectures for simplicity) by tweaking the rule for 'genassym.o' in 'sys/conf/kern.post.mk', leaving a comment there so that it can be removed when i386 is dropped (or if the above-mentioned dependency is broken). Fixes: 72ab129799a2 ("x86: remove sys/mount.h from genassym.c") Sponsored by: The FreeBSD Foundation --- sys/conf/kern.post.mk | 5 ++++- sys/i386/i386/genassym.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 7216393dbdf1..2abf1889d33b 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -260,7 +260,10 @@ genoffset_test.o: $S/kern/genoffset.c offset.inc assym.inc: $S/kern/genassym.sh genassym.o genoffset_test.o NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.TARGET} -genassym.o: $S/$M/$M/genassym.c offset.inc +# vnode_if.h added for the sake of i386 only to fix commit 72ab129799a2 ("x86: +# remove sys/mount.h from genassym.c"). Can be removed as soon as i386 kernels +# are dropped, or if the -> dependency vanishes. +genassym.o: $S/$M/$M/genassym.c offset.inc vnode_if.h ${CC} -c ${NOSAN_CFLAGS:N-flto*:N-fno-common} \ -fcommon $S/$M/$M/genassym.c diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index 1a31f6b3428c..9f994b9ca9d8 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include