D57402.diff
No OneTemporary
Actions

Size

1008 B

Referenced Files

None

Subscribers

None

D57402.diff
View Options

	diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
	--- a/sys/conf/kern.post.mk
	+++ b/sys/conf/kern.post.mk
	@@ -260,7 +260,10 @@
	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
	--- 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>