Date: Mon, 22 Jun 2026 16:00:28 +0000 From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner <olce@FreeBSD.org> Subject: git: 17c391c6a216 - stable/15 - i386: Fix build (of 'genassym.o') Message-ID: <6a395c1c.18ec5.2b9dfc56@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=17c391c6a2169f6a50644b6add63a98b7f7a707b commit 17c391c6a2169f6a50644b6add63a98b7f7a707b Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2026-06-03 13:11:52 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2026-06-22 15:59:37 +0000 i386: Fix build (of 'genassym.o') (cherry picked from commit ce243df20aa8ba94918cafdca2537c8cd18887c8) --- 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 7cdfd17778db..575e92a8230e 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 <sys/mount.h> -> <sys/vnode.h> 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 <sys/proc.h> #include <sys/errno.h> +#include <sys/mount.h> #include <sys/mutex.h> #include <sys/socket.h> #include <sys/resourcevar.h>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a395c1c.18ec5.2b9dfc56>