summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith-Denny <osde@linux.microsoft.com>2024-07-22 15:50:50 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-07-23 15:07:41 +0000
commitda591416ee8fddb1b691d157e3c61bdc7a994b79 (patch)
treee8c6fbb047e5b2ee8b3a04a3870547c750621b13
parent990bc4e562772521d771f3d0fe3e3d107ba3752f (diff)
downloadedk2-da591416ee8fddb1b691d157e3c61bdc7a994b79.tar.gz
edk2-da591416ee8fddb1b691d157e3c61bdc7a994b79.tar.bz2
edk2-da591416ee8fddb1b691d157e3c61bdc7a994b79.zip
BaseTools: Move GnuNoteBti.bin to BaseTools
This patch moves GnuNoteBti.bin from ArmPkg to BaseTools as it is used during the build by GCC. This removes an unnecessary dependency on ArmPkg from BaseTools and keeps build related files in BaseTools. Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
-rw-r--r--BaseTools/Bin/GnuNoteBti.bin (renamed from ArmPkg/Library/GnuNoteBti.bin)bin32 -> 32 bytes
-rwxr-xr-xBaseTools/Conf/tools_def.template2
2 files changed, 1 insertions, 1 deletions
diff --git a/ArmPkg/Library/GnuNoteBti.bin b/BaseTools/Bin/GnuNoteBti.bin
index 339567b4e8..339567b4e8 100644
--- a/ArmPkg/Library/GnuNoteBti.bin
+++ b/BaseTools/Bin/GnuNoteBti.bin
Binary files differ
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 8a2047e403..994cae2588 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -926,7 +926,7 @@ DEFINE GCC_IA32_RC_FLAGS = -I binary -O elf32-i386 -B i386
DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386 --rename-section .data=.hii
DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii
DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
-DEFINE GCC_AARCH64_RC_BTI_FLAGS = --add-section .note.gnu.property=$(WORKSPACE)/ArmPkg/Library/GnuNoteBti.bin --set-section-flags .note.gnu.property=alloc,readonly
+DEFINE GCC_AARCH64_RC_BTI_FLAGS = --add-section .note.gnu.property=$(WORKSPACE)/BaseTools/Bin/GnuNoteBti.bin --set-section-flags .note.gnu.property=alloc,readonly
DEFINE GCC_RISCV64_RC_FLAGS = -I binary -O elf64-littleriscv -B riscv --rename-section .data=.hii
DEFINE GCC_LOONGARCH64_RC_FLAGS = -I binary -O elf64-loongarch -B loongarch64 --rename-section .data=.hii