Re: [edk2] [PATCH 08/10] BaseTools/tools_def.template: Remove ELFGCC

2019-02-01 Thread Laszlo Ersek
On 02/01/19 06:34, Shenglei Zhang wrote:
> ELFGCC is too old.There is no verification for it.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1377
> 
> Cc: Bob Feng 
> Cc: Liming Gao 
> Cc: Yonghong Zhu 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang 
> ---
>  BaseTools/Conf/tools_def.template | 80 ---
>  1 file changed, 80 deletions(-)
> 
> diff --git a/BaseTools/Conf/tools_def.template 
> b/BaseTools/Conf/tools_def.template
> index e73fec42bf..0e671d55bc 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -136,7 +136,6 @@ DEFINE ICC11_BIN64x86 = C:\Program Files 
> (x86)\Intel\Compiler\DEF(ICC11_VERS
>  DEFINE EBC_BIN  = C:\Program Files\Intel\EBC\Bin
>  DEFINE EBC_BINx86   = C:\Program Files (x86)\Intel\EBC\Bin
>  
> -DEFINE ELFGCC_BIN   = /usr/bin
>  
>  DEFINE CYGWIN_BIN  = c:/cygwin/bin
>  DEFINE CYGWIN_BINIA32  = 
> c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin/
> @@ -296,12 +295,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc
>  # Required to build platforms or ACPI tables:
>  #   Intel(r) ACPI Compiler from
>  #   https://acpica.org/downloads
> -#   ELFGCC  -Linux-  Requires:
> -# GCC(this tool chain uses whatever version of 
> gcc and binutils that is installed in /usr/bin)
> -#Optional:
> -# Required to build platforms or ACPI tables:
> -#   Intel(r) ACPI Compiler from
> -#   https://acpica.org/downloads
>  #   CYGGCC  -win32-  Requires:
>  # CygWin, GCC 4.3.0, binutils 2.20.51.0.5
>  # Microsoft Visual Studio 2005 or 2008
> @@ -3999,79 +3992,6 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = 
> DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
>  *_CYGGCCxASL_EBC_SLINK_FLAGS= /lib /NOLOGO /MACHINE:EBC
>  *_CYGGCCxASL_EBC_DLINK_FLAGS= "C:\Program 
> Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF 
> /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /ALIGN:32 
> /DRIVER
>  
> -
> -#
> -# Elf GCC - This configuration is used to compile on Linux boxes to produce 
> elf
> -#   binaries.
> -#
> -
> -#   ELFGCC   - Linux ELF GCC
> -*_ELFGCC_*_*_FAMILY = GCC
> -*_ELFGCC_*_*_BUILDRULEFAMILY= GCCLD
> -*_ELFGCC_*_MAKE_PATH= make
> -
> -*_ELFGCC_*_PP_FLAGS = -E -x assembler-with-cpp -include 
> AutoGen.h
> -*_ELFGCC_*_VFRPP_FLAGS  = -x c -E -P -DVFRCOMPILE --include 
> $(MODULE_NAME)StrDefs.h
> -
> -##
> -# ASL definitions
> -##
> -*_ELFGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)
> -*_ELFGCC_*_ASL_FLAGS= DEF(IASL_FLAGS)
> -*_ELFGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
> -*_ELFGCC_*_ASLPP_FLAGS  = -x c -E -include AutoGen.h
> -*_ELFGCC_*_ASLCC_FLAGS  = -x c
> -*_ELFGCC_*_ASLDLINK_FLAGS   = DEF(GCC_DLINK_FLAGS_COMMON) 
> --entry _ReferenceAcpiTable
> -
> -##
> -# IA32 definitions
> -##
> -*_ELFGCC_IA32_OBJCOPY_PATH  = DEF(ELFGCC_BIN)/objcopy
> -*_ELFGCC_IA32_CC_PATH   = DEF(ELFGCC_BIN)/gcc
> -*_ELFGCC_IA32_SLINK_PATH= DEF(ELFGCC_BIN)/ar
> -*_ELFGCC_IA32_DLINK_PATH= DEF(ELFGCC_BIN)/ld
> -*_ELFGCC_IA32_ASM_PATH  = DEF(ELFGCC_BIN)/gcc
> -*_ELFGCC_IA32_PP_PATH   = DEF(ELFGCC_BIN)/gcc
> -*_ELFGCC_IA32_VFRPP_PATH= DEF(ELFGCC_BIN)/gcc
> -*_ELFGCC_IA32_ASLCC_PATH= DEF(ELFGCC_BIN)/gcc
> -*_ELFGCC_IA32_ASLPP_PATH= DEF(ELFGCC_BIN)/gcc
> -*_ELFGCC_IA32_ASLDLINK_PATH = DEF(ELFGCC_BIN)/ld
> -*_ELFGCC_IA32_RC_PATH   = DEF(ELFGCC_BIN)/objcopy
> -
> -*_ELFGCC_IA32_CC_FLAGS  = -m32 -g -fshort-wchar 
> -fno-strict-aliasing -Wall -malign-double -include 
> $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
> -*_ELFGCC_IA32_SLINK_FLAGS   =
> -*_ELFGCC_IA32_DLINK_FLAGS   = -melf_i386 -nostdlib --shared --entry 
> $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map 
> $(DEST_DIR_DEBUG)/$(BASE_NAME).map
> -#*_ELFGCC_IA32_DLINK_FLAGS  = -melf_i386 -nostdlib -n -q -Ttext 
> 0x220 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT)
> -*_ELFGCC_IA32_ASM_FLAGS = -m32 -c -x assembler -imacros 
> $(DEST_DIR_DEBUG)/AutoGen.h
> -*_ELFGCC_IA32_PP_FLAGS  = -m32 -E -x assembler-with-cpp -include 
> $(DEST_DIR_DEBUG)/AutoGen.h
> -*_ELFGCC_IA32_VFRPP_FLAG

[edk2] [PATCH 08/10] BaseTools/tools_def.template: Remove ELFGCC

2019-01-31 Thread Shenglei Zhang
ELFGCC is too old.There is no verification for it.
https://bugzilla.tianocore.org/show_bug.cgi?id=1377

Cc: Bob Feng 
Cc: Liming Gao 
Cc: Yonghong Zhu 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 BaseTools/Conf/tools_def.template | 80 ---
 1 file changed, 80 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
index e73fec42bf..0e671d55bc 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -136,7 +136,6 @@ DEFINE ICC11_BIN64x86 = C:\Program Files 
(x86)\Intel\Compiler\DEF(ICC11_VERS
 DEFINE EBC_BIN  = C:\Program Files\Intel\EBC\Bin
 DEFINE EBC_BINx86   = C:\Program Files (x86)\Intel\EBC\Bin
 
-DEFINE ELFGCC_BIN   = /usr/bin
 
 DEFINE CYGWIN_BIN  = c:/cygwin/bin
 DEFINE CYGWIN_BINIA32  = 
c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin/
@@ -296,12 +295,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc
 # Required to build platforms or ACPI tables:
 #   Intel(r) ACPI Compiler from
 #   https://acpica.org/downloads
-#   ELFGCC  -Linux-  Requires:
-# GCC(this tool chain uses whatever version of gcc 
and binutils that is installed in /usr/bin)
-#Optional:
-# Required to build platforms or ACPI tables:
-#   Intel(r) ACPI Compiler from
-#   https://acpica.org/downloads
 #   CYGGCC  -win32-  Requires:
 # CygWin, GCC 4.3.0, binutils 2.20.51.0.5
 # Microsoft Visual Studio 2005 or 2008
@@ -3999,79 +3992,6 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = 
DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
 *_CYGGCCxASL_EBC_SLINK_FLAGS= /lib /NOLOGO /MACHINE:EBC
 *_CYGGCCxASL_EBC_DLINK_FLAGS= "C:\Program 
Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF 
/ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /ALIGN:32 /DRIVER
 
-
-#
-# Elf GCC - This configuration is used to compile on Linux boxes to produce elf
-#   binaries.
-#
-
-#   ELFGCC   - Linux ELF GCC
-*_ELFGCC_*_*_FAMILY = GCC
-*_ELFGCC_*_*_BUILDRULEFAMILY= GCCLD
-*_ELFGCC_*_MAKE_PATH= make
-
-*_ELFGCC_*_PP_FLAGS = -E -x assembler-with-cpp -include 
AutoGen.h
-*_ELFGCC_*_VFRPP_FLAGS  = -x c -E -P -DVFRCOMPILE --include 
$(MODULE_NAME)StrDefs.h
-
-##
-# ASL definitions
-##
-*_ELFGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)
-*_ELFGCC_*_ASL_FLAGS= DEF(IASL_FLAGS)
-*_ELFGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
-*_ELFGCC_*_ASLPP_FLAGS  = -x c -E -include AutoGen.h
-*_ELFGCC_*_ASLCC_FLAGS  = -x c
-*_ELFGCC_*_ASLDLINK_FLAGS   = DEF(GCC_DLINK_FLAGS_COMMON) --entry 
_ReferenceAcpiTable
-
-##
-# IA32 definitions
-##
-*_ELFGCC_IA32_OBJCOPY_PATH  = DEF(ELFGCC_BIN)/objcopy
-*_ELFGCC_IA32_CC_PATH   = DEF(ELFGCC_BIN)/gcc
-*_ELFGCC_IA32_SLINK_PATH= DEF(ELFGCC_BIN)/ar
-*_ELFGCC_IA32_DLINK_PATH= DEF(ELFGCC_BIN)/ld
-*_ELFGCC_IA32_ASM_PATH  = DEF(ELFGCC_BIN)/gcc
-*_ELFGCC_IA32_PP_PATH   = DEF(ELFGCC_BIN)/gcc
-*_ELFGCC_IA32_VFRPP_PATH= DEF(ELFGCC_BIN)/gcc
-*_ELFGCC_IA32_ASLCC_PATH= DEF(ELFGCC_BIN)/gcc
-*_ELFGCC_IA32_ASLPP_PATH= DEF(ELFGCC_BIN)/gcc
-*_ELFGCC_IA32_ASLDLINK_PATH = DEF(ELFGCC_BIN)/ld
-*_ELFGCC_IA32_RC_PATH   = DEF(ELFGCC_BIN)/objcopy
-
-*_ELFGCC_IA32_CC_FLAGS  = -m32 -g -fshort-wchar 
-fno-strict-aliasing -Wall -malign-double -include $(DEST_DIR_DEBUG)/AutoGen.h 
-DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
-*_ELFGCC_IA32_SLINK_FLAGS   =
-*_ELFGCC_IA32_DLINK_FLAGS   = -melf_i386 -nostdlib --shared --entry 
$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map 
$(DEST_DIR_DEBUG)/$(BASE_NAME).map
-#*_ELFGCC_IA32_DLINK_FLAGS  = -melf_i386 -nostdlib -n -q -Ttext 0x220 
--entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT)
-*_ELFGCC_IA32_ASM_FLAGS = -m32 -c -x assembler -imacros 
$(DEST_DIR_DEBUG)/AutoGen.h
-*_ELFGCC_IA32_PP_FLAGS  = -m32 -E -x assembler-with-cpp -include 
$(DEST_DIR_DEBUG)/AutoGen.h
-*_ELFGCC_IA32_VFRPP_FLAGS   = -x c -E -P -DVFRCOMPILE --include 
$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-*_ELFGCC_IA32_RC_FLAGS  = DEF(GCC_IA32_RC_FLAGS)
-*_ELFGCC_IA32_OBJCOPY_FLAGS =
-*_ELFGCC_IA32_NASM_FLAGS= -f elf32
-
-