BaseTools/tools_def.template: propagate loss of GCC46 references

The last patch decremented references on a number of DEFs. They can be
classified into three groups:

(a) those that remain used by multiple toolchains (refcount >= 2):

- GCC_ASLCC_FLAGS
- GCC_ASLPP_FLAGS
- GCC_HOST_PREFIX
- GCC_IA32_RC_FLAGS
- GCC_PP_FLAGS
- GCC_VFRPP_FLAGS
- GCC_X64_RC_FLAGS
- IASL_FLAGS
- IASL_OUTFLAGS
- UNIX_IASL_BIN

(b) those that are only used by GCC48 (refcount == 1):

- GCC46_ASM_FLAGS
- GCC46_IA32_CC_FLAGS
- GCC46_IA32_DLINK2_FLAGS
- GCC46_IA32_X64_ASLDLINK_FLAGS
- GCC46_IA32_X64_DLINK_FLAGS
- GCC46_X64_CC_FLAGS
- GCC46_X64_DLINK2_FLAGS
- GCC46_X64_DLINK_FLAGS

(c) those that are no longer used (refcount == 0):

- GCC46_IA32_PREFIX
- GCC46_X64_PREFIX

For the members of class (b), expand their definitions at the referring
sites, and remove their definitions.

For the members of class (c), remove their definitions.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1377
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index d345050aa8445268272766943ce73bcab33110d6..dc43fed2b3adb9bdbe1d1222f1c7986fe5164cc1 100755 (executable)
--- 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)\r
 DEFINE GCC45_X64_PREFIX        = ENV(GCC45_BIN)\r
 \r
-DEFINE GCC46_IA32_PREFIX       = ENV(GCC46_BIN)\r
-DEFINE GCC46_X64_PREFIX        = ENV(GCC46_BIN)\r
-\r
 DEFINE GCC48_IA32_PREFIX       = ENV(GCC48_BIN)\r
 DEFINE GCC48_X64_PREFIX        = ENV(GCC48_BIN)\r
 \r
@@ -4180,23 +4177,14 @@ DEFINE GCC45_X64_DLINK_FLAGS         = DEF(GCC44_X64_DLINK_FLAGS)
 DEFINE GCC45_X64_DLINK2_FLAGS        = DEF(GCC44_X64_DLINK2_FLAGS)\r
 DEFINE GCC45_ASM_FLAGS               = DEF(GCC44_ASM_FLAGS)\r
 \r
-DEFINE GCC46_IA32_CC_FLAGS           = DEF(GCC45_IA32_CC_FLAGS) -Wno-address\r
-DEFINE GCC46_X64_CC_FLAGS            = DEF(GCC45_X64_CC_FLAGS) -Wno-address\r
-DEFINE GCC46_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS)\r
-DEFINE GCC46_IA32_X64_DLINK_FLAGS    = DEF(GCC45_IA32_X64_DLINK_FLAGS)\r
-DEFINE GCC46_IA32_DLINK2_FLAGS       = DEF(GCC45_IA32_DLINK2_FLAGS)\r
-DEFINE GCC46_X64_DLINK_FLAGS         = DEF(GCC45_X64_DLINK_FLAGS)\r
-DEFINE GCC46_X64_DLINK2_FLAGS        = DEF(GCC45_X64_DLINK2_FLAGS)\r
-DEFINE GCC46_ASM_FLAGS               = DEF(GCC45_ASM_FLAGS)\r
-\r
-DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC46_IA32_CC_FLAGS)\r
-DEFINE GCC48_X64_CC_FLAGS            = DEF(GCC46_X64_CC_FLAGS)\r
-DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS)\r
-DEFINE GCC48_IA32_X64_DLINK_FLAGS    = DEF(GCC46_IA32_X64_DLINK_FLAGS)\r
-DEFINE GCC48_IA32_DLINK2_FLAGS       = DEF(GCC46_IA32_DLINK2_FLAGS)\r
-DEFINE GCC48_X64_DLINK_FLAGS         = DEF(GCC46_X64_DLINK_FLAGS)\r
-DEFINE GCC48_X64_DLINK2_FLAGS        = DEF(GCC46_X64_DLINK2_FLAGS)\r
-DEFINE GCC48_ASM_FLAGS               = DEF(GCC46_ASM_FLAGS)\r
+DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC45_IA32_CC_FLAGS) -Wno-address\r
+DEFINE GCC48_X64_CC_FLAGS            = DEF(GCC45_X64_CC_FLAGS) -Wno-address\r
+DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS)\r
+DEFINE GCC48_IA32_X64_DLINK_FLAGS    = DEF(GCC45_IA32_X64_DLINK_FLAGS)\r
+DEFINE GCC48_IA32_DLINK2_FLAGS       = DEF(GCC45_IA32_DLINK2_FLAGS)\r
+DEFINE GCC48_X64_DLINK_FLAGS         = DEF(GCC45_X64_DLINK_FLAGS)\r
+DEFINE GCC48_X64_DLINK2_FLAGS        = DEF(GCC45_X64_DLINK2_FLAGS)\r
+DEFINE GCC48_ASM_FLAGS               = DEF(GCC45_ASM_FLAGS)\r
 DEFINE GCC48_ARM_ASM_FLAGS           = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian\r
 DEFINE GCC48_AARCH64_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian\r
 DEFINE GCC48_ARM_CC_FLAGS            = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations\r