From e701a4d51e6903da59086771f532928858839a2b Mon Sep 17 00:00:00 2001
From: Ard Biesheuvel <ardb@kernel.org>
Date: Mon, 27 Mar 2023 12:38:54 +0200
Subject: ArmPlatformPkg/PrePeiCore: Make vector table object BTI compatible

The object file containing the vector table does not contain any
callable functions, so it will not be implicitly annotated as BTI
compatible on BTI builds. So add the annotation by hand, and use the
'empty' type so we get the GNU ELF note but not the actual BTI opcode.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Reviewed-by: Oliver Smith-Denny <osd@smith-denny.com>
---
 ArmPlatformPkg/PrePeiCore/AArch64/Exception.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
index 43e40f97c3..ffb643a56d 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
@@ -112,3 +112,5 @@ _DefaultSError_LowerA32:
   TO_HANDLER
 
 VECTOR_END(PeiVectorTable)
+
+AARCH64_BTI_NOTE()
-- 
cgit v1.2.3