git: 17952b653256 - main - vmm: fix compilation errors for static kernel on arm64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Aug 2026 15:15:49 UTC
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=17952b65325640e90766495bcfc2c3321a75bc8c
commit 17952b65325640e90766495bcfc2c3321a75bc8c
Author: Nimish Jain <njain15@protonmail.com>
AuthorDate: 2026-08-13 15:01:00 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-08-13 15:15:16 +0000
vmm: fix compilation errors for static kernel on arm64
Fixes: 35164034e390 ("arm64/vmm: Make remaining registers use hypctx_*_sys_reg")
Reviewed by: markj
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D58690
---
sys/conf/files.arm64 | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 51089e5fe078..97268193d482 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -140,7 +140,16 @@ arm64/vmm/vmm_arm64.c optional vmm
arm64/vmm/vmm_reset.c optional vmm
arm64/vmm/vmm_handlers.c optional vmm
arm64/vmm/vmm_call.S optional vmm
+arm64/vmm/hyp_genassym.c optional vmm \
+ dependency "offset.inc" \
+ compile-with "${NOSAN_C:N-flto*:N-fno-common} -fcommon" \
+ no-obj
+hyp_assym.h optional vmm \
+ dependency "hyp_genassym.o" \
+ compile-with "sh $S/kern/genassym.sh hyp_genassym.o > ${.TARGET}" \
+ no-obj no-implicit-rule before-depend
arm64/vmm/vmm_nvhe_exception.S optional vmm \
+ dependency "hyp_assym.h" \
dependency "$S/arm64/vmm/vmm_hyp_exception.S" \
compile-with "${NOSAN_C} -fpie" \
no-obj
@@ -164,7 +173,9 @@ arm64/vmm/vmm_hyp_el2.S optional vmm \
dependency vmm_hyp_blob.bin
arm64/vmm/vmm_mmu.c optional vmm
arm64/vmm/vmm_vhe.c optional vmm
-arm64/vmm/vmm_vhe_exception.S optional vmm
+arm64/vmm/vmm_vhe_exception.S optional vmm \
+ dependency "hyp_assym.h" \
+ dependency "$S/arm64/vmm/vmm_hyp_exception.S"
arm64/vmm/io/vgic.c optional vmm
arm64/vmm/io/vgic_v3.c optional vmm
arm64/vmm/io/vgic_if.m optional vmm
@@ -172,6 +183,7 @@ arm64/vmm/io/vtimer.c optional vmm
dev/vmm/vmm_dev.c optional vmm
dev/vmm/vmm_mem.c optional vmm
dev/vmm/vmm_stat.c optional vmm
+dev/vmm/vmm_vm.c optional vmm
crypto/armv8/armv8_crypto.c optional armv8crypto
armv8_crypto_wrap.o optional armv8crypto \