From c6170b00f44e97f054a3e318744729d05d5360f9 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Fri, 24 Jan 2025 16:09:03 +0000 Subject: [PATCH] vmm: Depend on vmm_hyp* files as needed The arm64 vmm_nvhe* files depend on a vmm_hyp file to provide most of the implementation. As these are built with custom rules the normal generated dependency information is not used, even if generated. Add a dependency between these two sets of files to ensure when the implementation is updated the file will be rebuilt. Sponsored by: Arm Ltd --- sys/modules/vmm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 7c34dd92939..c990852ae44 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -45,11 +45,11 @@ CLEANFILES+= vmm_nvhe_exception.o vmm_nvhe.o CLEANFILES+= vmm_hyp_blob.elf.full CLEANFILES+= vmm_hyp_blob.elf vmm_hyp_blob.bin -vmm_nvhe_exception.o: vmm_nvhe_exception.S +vmm_nvhe_exception.o: vmm_nvhe_exception.S vmm_hyp_exception.S ${CC} -c -x assembler-with-cpp -DLOCORE \ ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} -o ${.TARGET} -fpie -vmm_nvhe.o: vmm_nvhe.c +vmm_nvhe.o: vmm_nvhe.c vmm_hyp.c ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} \ -o ${.TARGET} -fpie