git: 78d69d0a3c7f - main - arm64: Fix the kernel with options VMM

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=78d69d0a3c7f17944a7ecb84509fca6d0aa8545e

commit 78d69d0a3c7f17944a7ecb84509fca6d0aa8545e
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-08-21 09:06:57 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-08-21 10:16:10 +0000

    arm64: Fix the kernel with options VMM
    
     * We can build the non-VHE code with branch protection, it is already
       build as such in the module.
     * Use the correct file name for the non-VHE exception .o file.
---
 sys/conf/files.arm64 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index b105ce873d24..1c863ff98998 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -125,13 +125,13 @@ 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		\
-	compile-with "${NOSAN_C:N-mbranch-protection*} -fpie" \
+	compile-with "${NOSAN_C} -fpie"					\
 	no-obj
 arm64/vmm/vmm_nvhe.c				optional vmm		\
-	compile-with "${NOSAN_C:N-mbranch-protection*} -fpie" \
+	compile-with "${NOSAN_C} -fpie"					\
 	no-obj
 vmm_hyp_blob.elf.full				optional vmm		\
-	dependency	"vmm_nvhe.o vmm_hyp_exception.o"			\
+	dependency	"vmm_nvhe.o vmm_nvhe_exception.o"			\
 	compile-with	"${SYSTEM_LD_BASECMD} -o ${.TARGET} ${.ALLSRC} --defsym=_start='0x0' --defsym=text_start='0x0'"	\
 	no-obj no-implicit-rule
 vmm_hyp_blob.elf				optional vmm		\