diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2026-05-22 16:10:04 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2026-05-22 16:10:04 +0000 |
| commit | bed77cf7c213c3f93a0dc099e4b46c078495a328 (patch) | |
| tree | 28810d6d45033fd49e26ef985b8d9db44a5a1aec | |
| parent | c9546bb61910d40f4cb0dfb9716ba6eba44d1a0d (diff) | |
vmm/arm64: Compile vmm_nvhe.c without SSP
This file implements a set of EL2 hypercall handlers and is used to
switch between guests and the host kernel when VHE is not in use. There
is no SSP runtime available there.
Reported by: Jenkins
Fixes: 8deebce931fa ("kernel: Enable -fstack-protector-strong by default")
| -rw-r--r-- | sys/conf/files.arm64 | 2 | ||||
| -rw-r--r-- | sys/modules/vmm/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index faecea51d5c1..172f79cc5773 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -141,7 +141,7 @@ arm64/vmm/vmm_nvhe_exception.S optional vmm \ no-obj arm64/vmm/vmm_nvhe.c optional vmm \ dependency "$S/arm64/vmm/vmm_hyp.c" \ - compile-with "${NOSAN_C} -fpie" \ + compile-with "${NOSAN_C:N-fstack-protector*} -fpie" \ no-obj vmm_hyp_blob.elf.full optional vmm \ dependency "vmm_nvhe.o vmm_nvhe_exception.o" \ diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index dcb401d2026d..4084822c4f43 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -52,7 +52,7 @@ vmm_nvhe_exception.o: vmm_nvhe_exception.S vmm_hyp_exception.S ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} -o ${.TARGET} -fpie vmm_nvhe.o: vmm_nvhe.c vmm_hyp.c - ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} \ + ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*:N-fstack-protector*} ${.IMPSRC} \ -o ${.TARGET} -fpie vmm_hyp_blob.elf.full: vmm_nvhe_exception.o vmm_nvhe.o |