The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=fe1d344bf416aa921b4bf233668dda7cf4e27444
commit fe1d344bf416aa921b4bf233668dda7cf4e27444
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2025-09-22 17:10:12 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2025-09-23 17:08:37 +0000
sys/conf: Fix arm64 vmm_nvhe dependencies
These files include a vmm_hyp equivalent file but don't have a
dependency recorded. Fix this by manually adding this dependency.
This is only a problem in a non-GENERIC configuration as normally vmm
is loaded as vmm.ko.
Reviewed by: imp
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D51822
---
sys/conf/files.arm64 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 45966fea8041..856ea3af1372 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -127,9 +127,11 @@ arm64/vmm/vmm_reset.c
optional vmm
arm64/vmm/vmm_handlers.c optional vmm
arm64/vmm/vmm_call.S optional vmm
arm64/vmm/vmm_nvhe_exception.S optional vmm \
+ dependency "$S/arm64/vmm/vmm_hyp_exception.S" \
compile-with "${NOSAN_C} -fpie" \
no-obj
arm64/vmm/vmm_nvhe.c optional vmm \
+ dependency "$S/arm64/vmm/vmm_hyp.c" \
compile-with "${NOSAN_C} -fpie" \
no-obj
vmm_hyp_blob.elf.full optional vmm \
