On Sat, Dec 08, 2018 at 10:32:42AM +0100, Ard Biesheuvel wrote: > This drops ARM and AARCH64 support from the GCC46 and GCC47 toolchain > definitions, which are on the list to be removed, along with VS2003, > VS2005, VS2008, VS2010, DDK3790, UNIXGCC, GCC44, GCC45, ELFGCC, CYGGCC, > ICC, ICC11 and MYTOOLS. > > Since GCC46 and GCC47 are the only ones on that list that support ARM > and/or AARCH64, let's give Liming a hand and cover the ARM side of > things first, so that everything that remains to be removed is x86 > only. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <[email protected]>
I think I would personally prefer to see this folded into the "drop unused GCCnn profiles", but I'll leave that to the discretion of the BaseTools maintainers. GCC47_AARCH64* was always a bit cringeworthy, so glad to see it go :) >From an ARM perspective: Reviewed-by: Leif Lindholm <[email protected]> > --- > BaseTools/Conf/tools_def.template | 143 ++------------------ > 1 file changed, 14 insertions(+), 129 deletions(-) > > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index e0e68fd7fb49..3bc140d8f241 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -368,13 +368,13 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc > # Intel(r) ACPI Compiler from > # https://acpica.org/downloads > # GCC46 -Linux,Windows- Requires: > -# GCC 4.6 targeting x86_64-linux-gnu or > arm-linux-gnueabi > +# GCC 4.6 targeting x86_64-linux-gnu > # Optional: > # Required to build platforms or ACPI tables: > # Intel(r) ACPI Compiler from > # https://acpica.org/downloads > # GCC47 -Linux,Windows- Requires: > -# GCC 4.7 targeting x86_64-linux-gnu, > aarch64-linux-gnu, or arm-linux-gnueabi > +# GCC 4.7 targeting x86_64-linux-gnu > # Optional: > # Required to build platforms or ACPI tables: > # Intel(r) ACPI Compiler from > @@ -4199,12 +4199,6 @@ 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 GCC46_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_ASM_FLAGS) -mlittle-endian > -DEFINE GCC46_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations > -DEFINE GCC46_ARM_CC_XIPFLAGS = -D__ARM_FEATURE_UNALIGNED=0 > -DEFINE GCC46_ARM_DLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) > -Wl,--oformat=elf32-littlearm > -DEFINE GCC46_ARM_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) > -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 > -DEFINE GCC46_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_ASLDLINK_FLAGS) > -Wl,--oformat=elf32-littlearm > > DEFINE GCC47_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) > DEFINE GCC47_X64_CC_FLAGS = DEF(GCC46_X64_CC_FLAGS) > @@ -4215,18 +4209,6 @@ DEFINE GCC47_IA32_DLINK2_FLAGS = > DEF(GCC46_IA32_DLINK2_FLAGS) > DEFINE GCC47_X64_DLINK_FLAGS = DEF(GCC46_X64_DLINK_FLAGS) > DEFINE GCC47_X64_DLINK2_FLAGS = DEF(GCC46_X64_DLINK2_FLAGS) > DEFINE GCC47_ASM_FLAGS = DEF(GCC46_ASM_FLAGS) > -DEFINE GCC47_ARM_ASM_FLAGS = DEF(GCC46_ARM_ASM_FLAGS) > -DEFINE GCC47_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_ASM_FLAGS) -mlittle-endian > -DEFINE GCC47_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) > -DEFINE GCC47_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS) > -DEFINE GCC47_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) > -DEFINE GCC47_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) > -DEFINE GCC47_ARM_DLINK_FLAGS = DEF(GCC46_ARM_DLINK_FLAGS) > -DEFINE GCC47_ARM_DLINK2_FLAGS = DEF(GCC46_ARM_DLINK2_FLAGS) > -DEFINE GCC47_AARCH64_DLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) > -DEFINE GCC47_AARCH64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) > -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 > -DEFINE GCC47_ARM_ASLDLINK_FLAGS = DEF(GCC46_ARM_ASLDLINK_FLAGS) > -DEFINE GCC47_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_ASLDLINK_FLAGS) > > DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) > DEFINE GCC48_X64_CC_FLAGS = DEF(GCC47_X64_CC_FLAGS) > @@ -4237,18 +4219,18 @@ DEFINE GCC48_IA32_DLINK2_FLAGS = > DEF(GCC47_IA32_DLINK2_FLAGS) > DEFINE GCC48_X64_DLINK_FLAGS = DEF(GCC47_X64_DLINK_FLAGS) > DEFINE GCC48_X64_DLINK2_FLAGS = DEF(GCC47_X64_DLINK2_FLAGS) > DEFINE GCC48_ASM_FLAGS = DEF(GCC47_ASM_FLAGS) > -DEFINE GCC48_ARM_ASM_FLAGS = DEF(GCC47_ARM_ASM_FLAGS) > -DEFINE GCC48_AARCH64_ASM_FLAGS = DEF(GCC47_AARCH64_ASM_FLAGS) > -DEFINE GCC48_ARM_CC_FLAGS = DEF(GCC47_ARM_CC_FLAGS) > -DEFINE GCC48_ARM_CC_XIPFLAGS = DEF(GCC47_ARM_CC_XIPFLAGS) > -DEFINE GCC48_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) > -DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC47_AARCH64_CC_XIPFLAGS) > -DEFINE GCC48_ARM_DLINK_FLAGS = DEF(GCC47_ARM_DLINK_FLAGS) > -DEFINE GCC48_ARM_DLINK2_FLAGS = DEF(GCC47_ARM_DLINK2_FLAGS) > -DEFINE GCC48_AARCH64_DLINK_FLAGS = DEF(GCC47_AARCH64_DLINK_FLAGS) > -DEFINE GCC48_AARCH64_DLINK2_FLAGS = DEF(GCC47_AARCH64_DLINK2_FLAGS) > -DEFINE GCC48_ARM_ASLDLINK_FLAGS = DEF(GCC47_ARM_ASLDLINK_FLAGS) > -DEFINE GCC48_AARCH64_ASLDLINK_FLAGS = DEF(GCC47_AARCH64_ASLDLINK_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 > +DEFINE GCC48_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS) > +DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) > +DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) > +DEFINE GCC48_ARM_DLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) > -Wl,--oformat=elf32-littlearm > +DEFINE GCC48_ARM_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) > -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 > +DEFINE GCC48_AARCH64_DLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) > +DEFINE GCC48_AARCH64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) > -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 > +DEFINE GCC48_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_ASLDLINK_FLAGS) > -Wl,--oformat=elf32-littlearm > +DEFINE GCC48_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_ASLDLINK_FLAGS) > > DEFINE GCC49_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) > DEFINE GCC49_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) > @@ -4588,40 +4570,6 @@ RELEASE_GCC46_IA32_CC_FLAGS = > DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but > 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 > > -################## > -# GCC46 ARM definitions > -################## > -*_GCC46_ARM_OBJCOPY_PATH = echo > -*_GCC46_ARM_CC_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_SLINK_PATH = ENV(GCC46_ARM_PREFIX)ar > -*_GCC46_ARM_DLINK_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_ASLDLINK_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_ASM_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_PP_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_VFRPP_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_ASLCC_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_ASLPP_PATH = ENV(GCC46_ARM_PREFIX)gcc > -*_GCC46_ARM_RC_PATH = ENV(GCC46_ARM_PREFIX)objcopy > - > -*_GCC46_ARM_ARCHCC_FLAGS = > -*_GCC46_ARM_PLATFORM_FLAGS = -march=armv7-a > - > -*_GCC46_ARM_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) > -*_GCC46_ARM_ASLDLINK_FLAGS = DEF(GCC46_ARM_ASLDLINK_FLAGS) > -*_GCC46_ARM_ASM_FLAGS = DEF(GCC46_ARM_ASM_FLAGS) > -*_GCC46_ARM_DLINK_FLAGS = DEF(GCC46_ARM_DLINK_FLAGS) > -*_GCC46_ARM_DLINK2_FLAGS = DEF(GCC46_ARM_DLINK2_FLAGS) > -*_GCC46_ARM_DTCPP_FLAGS = DEF(GCC_DTCPP_FLAGS) > -*_GCC46_ARM_PLATFORM_FLAGS = -march=armv7-a > -*_GCC46_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_PP_FLAGS) > -*_GCC46_ARM_RC_FLAGS = DEF(GCC_ARM_RC_FLAGS) > -*_GCC46_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_VFRPP_FLAGS) > -*_GCC46_ARM_CC_XIPFLAGS = DEF(GCC46_ARM_CC_XIPFLAGS) > - > - DEBUG_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -O0 > -RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) > -Wno-unused-but-set-variable > - NOOPT_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -O0 > - > > #################################################################################### > # > # GCC 4.7 - This configuration is used to compile under Linux to produce > @@ -4698,69 +4646,6 @@ RELEASE_GCC47_IA32_CC_FLAGS = > DEF(GCC47_IA32_CC_FLAGS) -Os -Wno-unused-but > RELEASE_GCC47_X64_CC_FLAGS = DEF(GCC47_X64_CC_FLAGS) -Os > -Wno-unused-but-set-variable > NOOPT_GCC47_X64_CC_FLAGS = DEF(GCC47_X64_CC_FLAGS) -O0 > > -################## > -# GCC47 ARM definitions > -################## > -*_GCC47_ARM_CC_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_SLINK_PATH = ENV(GCC47_ARM_PREFIX)ar > -*_GCC47_ARM_DLINK_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_ASLDLINK_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_ASM_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_PP_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_VFRPP_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_ASLCC_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_ASLPP_PATH = ENV(GCC47_ARM_PREFIX)gcc > -*_GCC47_ARM_RC_PATH = ENV(GCC47_ARM_PREFIX)objcopy > - > -*_GCC47_ARM_ARCHCC_FLAGS = > -*_GCC47_ARM_PLATFORM_FLAGS = -march=armv7-a > - > -*_GCC47_ARM_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) > -*_GCC47_ARM_ASLDLINK_FLAGS = DEF(GCC47_ARM_ASLDLINK_FLAGS) > -*_GCC47_ARM_ASM_FLAGS = DEF(GCC47_ARM_ASM_FLAGS) > -*_GCC47_ARM_DLINK_FLAGS = DEF(GCC47_ARM_DLINK_FLAGS) > -*_GCC47_ARM_DLINK2_FLAGS = DEF(GCC47_ARM_DLINK2_FLAGS) > -*_GCC47_ARM_DTCPP_FLAGS = DEF(GCC_DTCPP_FLAGS) > -*_GCC47_ARM_PLATFORM_FLAGS = -march=armv7-a > -*_GCC47_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_PP_FLAGS) > -*_GCC47_ARM_RC_FLAGS = DEF(GCC_ARM_RC_FLAGS) > -*_GCC47_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_VFRPP_FLAGS) > -*_GCC47_ARM_CC_XIPFLAGS = DEF(GCC47_ARM_CC_XIPFLAGS) > - > - DEBUG_GCC47_ARM_CC_FLAGS = DEF(GCC47_ARM_CC_FLAGS) -O0 > -RELEASE_GCC47_ARM_CC_FLAGS = DEF(GCC47_ARM_CC_FLAGS) > -Wno-unused-but-set-variable > - NOOPT_GCC47_ARM_CC_FLAGS = DEF(GCC47_ARM_CC_FLAGS) -O0 > - > -################## > -# GCC47 AARCH64 definitions > -################## > -*_GCC47_AARCH64_CC_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_SLINK_PATH = ENV(GCC47_AARCH64_PREFIX)ar > -*_GCC47_AARCH64_DLINK_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_ASLDLINK_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_ASM_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_PP_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_VFRPP_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_ASLCC_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_ASLPP_PATH = ENV(GCC47_AARCH64_PREFIX)gcc > -*_GCC47_AARCH64_RC_PATH = ENV(GCC47_AARCH64_PREFIX)objcopy > - > -*_GCC47_AARCH64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) > -*_GCC47_AARCH64_ASLDLINK_FLAGS = DEF(GCC47_AARCH64_ASLDLINK_FLAGS) > -*_GCC47_AARCH64_ASM_FLAGS = DEF(GCC47_AARCH64_ASM_FLAGS) > -*_GCC47_AARCH64_DLINK_FLAGS = DEF(GCC47_AARCH64_DLINK_FLAGS) > -*_GCC47_AARCH64_DLINK2_FLAGS = DEF(GCC47_AARCH64_DLINK2_FLAGS) > -*_GCC47_AARCH64_DTCPP_FLAGS = DEF(GCC_DTCPP_FLAGS) > -*_GCC47_AARCH64_PLATFORM_FLAGS = > -*_GCC47_AARCH64_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_PP_FLAGS) > -*_GCC47_AARCH64_RC_FLAGS = DEF(GCC_AARCH64_RC_FLAGS) > -*_GCC47_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > DEF(GCC_VFRPP_FLAGS) > -*_GCC47_AARCH64_CC_XIPFLAGS = DEF(GCC47_AARCH64_CC_XIPFLAGS) > - > - DEBUG_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -O0 > -RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) > -Wno-unused-but-set-variable > - NOOPT_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -O0 > - > > #################################################################################### > # > # GCC 4.8 - This configuration is used to compile under Linux to produce > -- > 2.19.2 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
