diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index d345050aa8..dc43fed2b3 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -193,9 +193,6 @@ DEFINE GCC44_X64_PREFIX = ENV(GCC44_BIN) DEFINE GCC45_IA32_PREFIX = ENV(GCC45_BIN) DEFINE GCC45_X64_PREFIX = ENV(GCC45_BIN) -DEFINE GCC46_IA32_PREFIX = ENV(GCC46_BIN) -DEFINE GCC46_X64_PREFIX = ENV(GCC46_BIN) - DEFINE GCC48_IA32_PREFIX = ENV(GCC48_BIN) DEFINE GCC48_X64_PREFIX = ENV(GCC48_BIN) @@ -4180,23 +4177,14 @@ DEFINE GCC45_X64_DLINK_FLAGS = DEF(GCC44_X64_DLINK_FLAGS) DEFINE GCC45_X64_DLINK2_FLAGS = DEF(GCC44_X64_DLINK2_FLAGS) DEFINE GCC45_ASM_FLAGS = DEF(GCC44_ASM_FLAGS) -DEFINE GCC46_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Wno-address -DEFINE GCC46_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Wno-address -DEFINE GCC46_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -DEFINE GCC46_IA32_X64_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS) -DEFINE GCC46_IA32_DLINK2_FLAGS = DEF(GCC45_IA32_DLINK2_FLAGS) -DEFINE GCC46_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS) -DEFINE GCC46_X64_DLINK2_FLAGS = DEF(GCC45_X64_DLINK2_FLAGS) -DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) - -DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -DEFINE GCC48_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS) -DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC46_IA32_X64_DLINK_FLAGS) -DEFINE GCC48_IA32_DLINK2_FLAGS = DEF(GCC46_IA32_DLINK2_FLAGS) -DEFINE GCC48_X64_DLINK_FLAGS = DEF(GCC46_X64_DLINK_FLAGS) -DEFINE GCC48_X64_DLINK2_FLAGS = DEF(GCC46_X64_DLINK2_FLAGS) -DEFINE GCC48_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) +DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Wno-address +DEFINE GCC48_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Wno-address +DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) +DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS) +DEFINE GCC48_IA32_DLINK2_FLAGS = DEF(GCC45_IA32_DLINK2_FLAGS) +DEFINE GCC48_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS) +DEFINE GCC48_X64_DLINK2_FLAGS = DEF(GCC45_X64_DLINK2_FLAGS) +DEFINE GCC48_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian DEFINE GCC48_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations