git: 26173a919ced - main - arm64/vmm: Exclude more sanitizer compiler flags from certain files

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=26173a919ced6179aa758db44fffc3bcac532be6

commit 26173a919ced6179aa758db44fffc3bcac532be6
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-03-22 04:19:11 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-03-22 04:20:34 +0000

    arm64/vmm: Exclude more sanitizer compiler flags from certain files
    
    Reported by:    rscheff
    Fixes:          47e073941f4e ("Import the kernel parts of bhyve/arm64")
---
 sys/conf/files.arm64     | 4 ++--
 sys/modules/vmm/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index ef00857b61c0..679d442f672b 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -124,10 +124,10 @@ arm64/vmm/vmm_arm64.c                             
optional vmm
 arm64/vmm/vmm_reset.c                          optional vmm
 arm64/vmm/vmm_call.S                           optional vmm
 arm64/vmm/vmm_hyp_exception.S                  optional vmm            \
-       compile-with    "${NORMAL_C:N-fsanitize*:N-mbranch-protection*} -fpie"  
        \
+       compile-with    
"${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} -fpie"          
\
        no-obj
 arm64/vmm/vmm_hyp.c                            optional vmm            \
-       compile-with    "${NORMAL_C:N-fsanitize*:N-mbranch-protection*} -fpie"  
        \
+       compile-with    
"${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} -fpie"          
\
        no-obj
 vmm_hyp_blob.elf.full                          optional vmm            \
        dependency      "vmm_hyp.o vmm_hyp_exception.o"                 \
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
index 075e594c4da1..1ef9e264ee97 100644
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -41,11 +41,11 @@ CLEANFILES+=        vmm_hyp_blob.elf vmm_hyp_blob.bin
 
 vmm_hyp_exception.o: vmm_hyp_exception.S
        ${CC} -c -x assembler-with-cpp -DLOCORE \
-           ${CFLAGS:N-fsanitize*:N-mbranch-protection*} \
+               ${CFLAGS:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} \
            ${.IMPSRC} -o ${.TARGET} -fpie
 
 vmm_hyp.o: vmm_hyp.c
-       ${CC} -c ${CFLAGS:N-fsanitize*:N-mbranch-protection*} \
+       ${CC} -c ${CFLAGS:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} \
            ${.IMPSRC} -o ${.TARGET} -fpie
 
 vmm_hyp_blob.elf.full: vmm_hyp_exception.o vmm_hyp.o