summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2023-03-30 09:16:19 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-03-30 11:05:22 +0000
commit3b4d1b38eac0542c8942dd114a6600d31aec503d (patch)
tree8ae44451492204cd93a18035e47903cff70858a8
parente701a4d51e6903da59086771f532928858839a2b (diff)
downloadedk2-3b4d1b38eac0542c8942dd114a6600d31aec503d.zip
edk2-3b4d1b38eac0542c8942dd114a6600d31aec503d.tar.gz
edk2-3b4d1b38eac0542c8942dd114a6600d31aec503d.tar.bz2
ArmVirtPkg/ArmPlatformLibQemu: Make IdMap.S BTI compatible
The IdMap.S asm source file has not executable content, but its lack of a BTI annotation prevents the linker from marking any executables it emits as BTI compatible if this object is part of the build. So add the BTI note by hand. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-rw-r--r--ArmVirtPkg/Library/ArmPlatformLibQemu/IdMap.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/ArmVirtPkg/Library/ArmPlatformLibQemu/IdMap.S b/ArmVirtPkg/Library/ArmPlatformLibQemu/IdMap.S
index 584ffcb..ba65809 100644
--- a/ArmVirtPkg/Library/ArmPlatformLibQemu/IdMap.S
+++ b/ArmVirtPkg/Library/ArmPlatformLibQemu/IdMap.S
@@ -57,3 +57,5 @@ idmap: /* level 0 */
.quad PAGE_XIP | (idx << 12) // 2044 KiB of R-X flash mappings
.set idx, idx + 1
.endr
+
+AARCH64_BTI_NOTE()