1- From aa8d288279ef96ffe576a0e434c1d9f435fef1e7 Mon Sep 17 00:00:00 2001
1+ From cab468c477f4a3aa4c82dc97d1b488e351a5ca1f Mon Sep 17 00:00:00 2001
22From: Kevin Wang <wy721@qq.com>
3- Date: Mon, 4 Nov 2024 04:29:03 +0000
4- Subject: [PATCH 3/5 ] Debug prefix map
3+ Date: Wed, 18 Mar 2026 08:25:21 +0000
4+ Subject: [PATCH] Debug prefix map
55
66---
77 BaseTools/Conf/tools_def.template | 18 +++++++++---------
88 1 file changed, 9 insertions(+), 9 deletions(-)
99
1010diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
11- index 0f110fbb4a..35205db748 100755
11+ index cca699c4a8..f3bedcf9d2 100755
1212--- a/BaseTools/Conf/tools_def.template
1313+++ b/BaseTools/Conf/tools_def.template
14- @@ -896 ,7 +896 ,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
14+ @@ -920 ,7 +920 ,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
1515 *_*_*_DTC_PATH = DEF(DTC_BIN)
1616
1717 # All supported GCC archs except LOONGARCH64 support -mstack-protector-guard=global, so set that on everything except LOONGARCH64
@@ -20,68 +20,68 @@ index 0f110fbb4a..35205db748 100755
2020 DEFINE GCC_IA32_X64_CC_FLAGS = -mstack-protector-guard=global
2121 DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie -mstack-protector-guard=global
2222 DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections
23- @@ -918 ,8 +918 ,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
23+ @@ -941 ,8 +941 ,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
2424 DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
2525 DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
2626 DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
2727- DEFINE GCC_ASM_FLAGS = -c -x assembler -imacros AutoGen.h
2828- DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h
2929+ DEFINE GCC_ASM_FLAGS = -c -x assembler -imacros AutoGen.h ENV(GCC_PREFIX_MAP)
3030+ DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h ENV(GCC_PREFIX_MAP)
31- DEFINE GCC_VFRPP_FLAGS = -x c -E -P - DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
31+ DEFINE GCC_VFRPP_FLAGS = -x c -E -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h
3232 DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h
3333 DEFINE GCC_ASLCC_FLAGS = -x c
34- @@ -1072 ,7 +1072 ,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF(
34+ @@ -1095 ,7 +1095 ,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF(
3535 *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS)
3636 *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
3737 *_GCC48_IA32_OBJCOPY_FLAGS =
3838- *_GCC48_IA32_NASM_FLAGS = -f elf32
39- + *_GCC48_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
39+ +*_GCC48_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
4040
4141 DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS)
4242 RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable
43- @@ -1100 ,7 +1100 ,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
43+ @@ -1123 ,7 +1123 ,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
4444 *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS)
4545 *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
4646 *_GCC48_X64_OBJCOPY_FLAGS =
4747- *_GCC48_X64_NASM_FLAGS = -f elf64
48- + *_GCC48_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
48+ +*_GCC48_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
4949
5050 DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)
5151 RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable
52- @@ -1209 ,7 +1209 ,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
52+ @@ -1232 ,7 +1232 ,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
5353 *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS)
5454 *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
5555 *_GCC49_IA32_OBJCOPY_FLAGS =
5656- *_GCC49_IA32_NASM_FLAGS = -f elf32
57- + *_GCC49_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
57+ +*_GCC49_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
5858
5959 DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS)
6060 RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable
61- @@ -1237 ,7 +1237 ,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
61+ @@ -1260 ,7 +1260 ,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
6262 *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS)
6363 *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
6464 *_GCC49_X64_OBJCOPY_FLAGS =
6565- *_GCC49_X64_NASM_FLAGS = -f elf64
66- + *_GCC49_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
66+ +*_GCC49_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
6767
6868 DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)
6969 RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable
70- @@ -1496 ,7 +1496 ,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
70+ @@ -1519 ,7 +1519 ,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
7171 *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie
7272 *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
7373 *_GCC5_IA32_OBJCOPY_FLAGS =
7474- *_GCC5_IA32_NASM_FLAGS = -f elf32
75- + *_GCC5_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
75+ +*_GCC5_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)
7676
7777 DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto
7878 DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386
79- @@ -1528 ,7 +1528 ,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
79+ @@ -1551 ,7 +1551 ,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
8080 *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS)
8181 *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
8282 *_GCC5_X64_OBJCOPY_FLAGS =
8383- *_GCC5_X64_NASM_FLAGS = -f elf64
84- + *_GCC5_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
84+ +*_GCC5_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)
8585
8686 DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO
8787 DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os
0 commit comments