Remove the "leaf" definitions for GCC46. These definitions are never referenced in "tools_def.template" (they are the last GCC46 mentions in the file), so their removal can't break other definitions. Instead, their erasure turns other definitions into leaves (subject to further removal).
Cc: Bob Feng <[email protected]> Cc: Liming Gao <[email protected]> Cc: Yonghong Zhu <[email protected]> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1377 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek <[email protected]> --- BaseTools/Conf/tools_def.template | 76 -------------------- 1 file changed, 76 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 67cba281539e..d345050aa844 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -4472,82 +4472,6 @@ RELEASE_GCC45_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Os RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os NOOPT_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -O0 -#################################################################################### -# -# GCC 4.6 - This configuration is used to compile under Linux to produce -# PE/COFF binaries using GCC 4.6. -# -#################################################################################### -*_GCC46_*_*_FAMILY = GCC - -*_GCC46_*_MAKE_PATH = DEF(GCC_HOST_PREFIX)make -*_GCC46_*_*_DLL = ENV(GCC46_DLL) -*_GCC46_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -*_GCC46_*_PP_FLAGS = DEF(GCC_PP_FLAGS) -*_GCC46_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) -*_GCC46_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -*_GCC46_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) -*_GCC46_*_APP_FLAGS = -*_GCC46_*_ASL_FLAGS = DEF(IASL_FLAGS) -*_GCC46_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS) - -################## -# GCC46 IA32 definitions -################## -*_GCC46_IA32_OBJCOPY_PATH = DEF(GCC46_IA32_PREFIX)objcopy -*_GCC46_IA32_CC_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_SLINK_PATH = DEF(GCC46_IA32_PREFIX)ar -*_GCC46_IA32_DLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_ASLDLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_ASM_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_PP_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_VFRPP_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_ASLCC_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_ASLPP_PATH = DEF(GCC46_IA32_PREFIX)gcc -*_GCC46_IA32_RC_PATH = DEF(GCC46_IA32_PREFIX)objcopy - -*_GCC46_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -*_GCC46_IA32_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -*_GCC46_IA32_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) -m32 -march=i386 -*_GCC46_IA32_DLINK_FLAGS = DEF(GCC46_IA32_X64_DLINK_FLAGS) -Wl,-m,elf_i386,--oformat=elf32-i386 -*_GCC46_IA32_DLINK2_FLAGS = DEF(GCC46_IA32_DLINK2_FLAGS) -*_GCC46_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) -*_GCC46_IA32_OBJCOPY_FLAGS = -*_GCC46_IA32_NASM_FLAGS = -f elf32 - - DEBUG_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os -RELEASE_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but-set-variable - NOOPT_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -O0 - -################## -# GCC46 X64 definitions -################## -*_GCC46_X64_OBJCOPY_PATH = DEF(GCC46_X64_PREFIX)objcopy -*_GCC46_X64_CC_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_SLINK_PATH = DEF(GCC46_X64_PREFIX)ar -*_GCC46_X64_DLINK_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_ASLDLINK_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_ASM_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_PP_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_VFRPP_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_ASLCC_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_ASLPP_PATH = DEF(GCC46_X64_PREFIX)gcc -*_GCC46_X64_RC_PATH = DEF(GCC46_X64_PREFIX)objcopy - -*_GCC46_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -*_GCC46_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -*_GCC46_X64_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) -m64 -melf_x86_64 -*_GCC46_X64_DLINK_FLAGS = DEF(GCC46_X64_DLINK_FLAGS) -*_GCC46_X64_DLINK2_FLAGS = DEF(GCC46_X64_DLINK2_FLAGS) -*_GCC46_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) -*_GCC46_X64_OBJCOPY_FLAGS = -*_GCC46_X64_NASM_FLAGS = -f elf64 - - DEBUG_GCC46_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS) -Os -RELEASE_GCC46_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS) -Os -Wno-unused-but-set-variable - NOOPT_GCC46_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS) -O0 - #################################################################################### # # GCC 4.8 - This configuration is used to compile under Linux to produce -- 2.19.1.3.g30247aa5d201 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
