The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=63f7a383434ae81cdccc6250045f637f8ae9615a
commit 63f7a383434ae81cdccc6250045f637f8ae9615a Author: Andrew Turner <and...@freebsd.org> AuthorDate: 2024-06-10 14:58:15 +0000 Commit: Andrew Turner <and...@freebsd.org> CommitDate: 2024-06-10 15:16:10 +0000 vmm: Only link the arm64 hyp code in vmm.ko once This code runs at EL2 while the kernel runs at EL1. We build these files for EL2 through a dependency in vmm_hyp_blob.elf.full so there is no need to include them in SRCS. Reviewed by: imp, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45467 --- sys/modules/vmm/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6737d868f2ea..8f6eb915290a 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -34,8 +34,7 @@ SRCS+= vgic.c \ vgic_v3.c \ vtimer.c -SRCS+= vmm_hyp_exception.S vmm_hyp.c - +CLEANFILES+= vmm_hyp_exception.o vmm_hyp.o CLEANFILES+= vmm_hyp_blob.elf.full CLEANFILES+= vmm_hyp_blob.elf vmm_hyp_blob.bin