git: b87952e837ec - main - arm64/vmm: Mark asm files as supporting BTI
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Aug 2024 09:02:26 UTC
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=b87952e837ec1e42a573557a8e938693d8952705
commit b87952e837ec1e42a573557a8e938693d8952705
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-08-19 13:28:39 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-08-20 08:49:16 +0000
arm64/vmm: Mark asm files as supporting BTI
These already support BTI as they use the ENTRY macro. While the
non-VHE code doesn't need this the new VHE code will need it as it is
linked into either the kernel or the vmm module so will be included in
the BTI check.
Sponsored by: Arm Ltd
---
sys/arm64/vmm/vmm_hyp_exception.S | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys/arm64/vmm/vmm_hyp_exception.S b/sys/arm64/vmm/vmm_hyp_exception.S
index 95b0e20f37ed..50c2490f37bf 100644
--- a/sys/arm64/vmm/vmm_hyp_exception.S
+++ b/sys/arm64/vmm/vmm_hyp_exception.S
@@ -30,6 +30,7 @@
*/
+#include <sys/elf_common.h>
#include <machine/asm.h>
#include <machine/hypervisor.h>
@@ -316,3 +317,5 @@ ENTRY(VMM_HYP_FUNC(do_call_guest))
/* Enter guest */
ERET
END(VMM_HYP_FUNC(do_call_guest))
+
+GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)