From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=shenglei.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 38083208D6148 for ; Sun, 10 Feb 2019 18:48:22 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Feb 2019 18:48:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,357,1544515200"; d="scan'208";a="319279157" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga005.fm.intel.com with ESMTP; 10 Feb 2019 18:48:20 -0800 From: Shenglei Zhang To: edk2-devel@lists.01.org Cc: Bob Feng , Liming Gao , Yonghong Zhu Date: Mon, 11 Feb 2019 10:48:03 +0800 Message-Id: <20190211024809.20408-5-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190211024809.20408-1-shenglei.zhang@intel.com> References: <20190211024809.20408-1-shenglei.zhang@intel.com> Subject: [PATCH v2 04/10] BaseTools/tools_def.template: Remove UNIXGCC X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2019 02:48:22 -0000 UNIXGCC 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 Reviewed-by: Laszlo Ersek --- BaseTools/Conf/tools_def.template | 96 ------------------------------- 1 file changed, 96 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 162227ace1..ab5dc78b19 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -138,29 +138,6 @@ DEFINE EBC_BINx86 = C:\Program Files (x86)\Intel\EBC\Bin DEFINE ELFGCC_BIN = /usr/bin -# -# Option 1: Hard coded full path to compiler suite -DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin/ -DEFINE UNIXGCC_X64_PETOOLS_PREFIX = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/ -# -# Option 2: Use an environment variable -#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(IA32_PETOOLS_PREFIX) -#DEFINE UNIXGCC_X64_PETOOLS_PREFIX = ENV(X64_PETOOLS_PREFIX) -# -# Option 3: Install the compiler suite into your default paths -#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = i386-pc-mingw32- -#DEFINE UNIXGCC_X64_PETOOLS_PREFIX = x86_64-pc-mingw32- -# -# Option 4: Create links under the BaseTools/Bin/gcc/ARCH directory -# Links needed: gcc, ar & ld -#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(WORKSPACE)/BaseTools/Bin/gcc/Ia32/ -#DEFINE UNIXGCC_X64_PETOOLS_PREFIX = ENV(WORKSPACE)/BaseTools/Bin/gcc/X64/ -# -# Option 5: Install programs under user's home directory -#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(HOME)/programs/gcc/ia32/bin/i686-pc-mingw32- -#DEFINE UNIXGCC_X64_PETOOLS_PREFIX = ENV(HOME)/programs/gcc/x64/bin/x86_64-pc-mingw32- -# - DEFINE CYGWIN_BIN = c:/cygwin/bin DEFINE CYGWIN_BINIA32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin/ DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/ @@ -288,13 +265,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc # Note: # Building of XIP firmware images for ARM/ARM64 is not currently supported (only applications). # /FILEALIGN:4096 and other changes are needed for ARM firmware builds. -# UNIXGCC -UNIX- Requires: -# GCC 4.3.0 -# binutils 2.20.51.0.5 -# Optional: -# Required to build platforms or ACPI tables: -# Intel(r) ACPI Compiler from -# https://acpica.org/downloads # GCC48 -Linux,Windows- Requires: # GCC 4.8 targeting x86_64-linux-gnu, aarch64-linux-gnu, or arm-linux-gnueabi # Optional: @@ -3159,72 +3129,6 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF *_VS2017_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC *_VS2017_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER -#################################################################################### -# -# Unix GCC And Intel Linux ACPI Compiler -# -#################################################################################### -# UNIXGCC - UNIX GCC -# ASL - Intel Linux ACPI Source Language Compiler (iasl) -*_UNIXGCC_*_*_FAMILY = GCC -*_UNIXGCC_*_*_BUILDRULEFAMILY = GCCLD - -*_UNIXGCC_*_MAKE_PATH = make -*_UNIXGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -*_UNIXGCC_IA32_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_FLAGS) --image-base=0 -*_UNIXGCC_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_FLAGS) --image-base=0 -*_UNIXGCC_IA32_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_ASLDLINK_FLAGS) -*_UNIXGCC_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_ASLDLINK_FLAGS) -*_UNIXGCC_*_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -*_UNIXGCC_*_PP_FLAGS = DEF(GCC_PP_FLAGS) -*_UNIXGCC_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) -*_UNIXGCC_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -*_UNIXGCC_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) -*_UNIXGCC_*_APP_FLAGS = -*_UNIXGCC_*_ASL_FLAGS = DEF(IASL_FLAGS) -*_UNIXGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS) - -################## -# IA32 definitions -################## -*_UNIXGCC_IA32_OBJCOPY_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)objcopy -*_UNIXGCC_IA32_PP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc -*_UNIXGCC_IA32_CC_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc -*_UNIXGCC_IA32_SLINK_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ar -*_UNIXGCC_IA32_DLINK_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ld -*_UNIXGCC_IA32_ASLPP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc -*_UNIXGCC_IA32_ASLCC_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc -*_UNIXGCC_IA32_ASLDLINK_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ld -*_UNIXGCC_IA32_ASM_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc -*_UNIXGCC_IA32_VFRPP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc -*_UNIXGCC_IA32_RC_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)objcopy - -*_UNIXGCC_IA32_CC_FLAGS = DEF(GCC_IA32_CC_FLAGS) -*_UNIXGCC_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) -*_UNIXGCC_IA32_OBJCOPY_FLAGS = -*_UNIXGCC_IA32_NASM_FLAGS = -f win32 - -################## -# X64 definitions -################## -*_UNIXGCC_X64_CC_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc -*_UNIXGCC_X64_ASLCC_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc -*_UNIXGCC_X64_SLINK_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ar -*_UNIXGCC_X64_DLINK_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ld -*_UNIXGCC_X64_ASLDLINK_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ld -*_UNIXGCC_X64_ASM_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc -*_UNIXGCC_X64_PP_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc -*_UNIXGCC_X64_ASLPP_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc -*_UNIXGCC_X64_VFRPP_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc -*_UNIXGCC_X64_RC_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)objcopy -*_UNIXGCC_X64_OBJCOPY_PATH = DEF(UNIXGCC_X64_PETOOLS_PREFIX)objcopy - -*_UNIXGCC_X64_CC_FLAGS = DEF(GCC_X64_CC_FLAGS) -*_UNIXGCC_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) -*_UNIXGCC_X64_OBJCOPY_FLAGS = -*_UNIXGCC_X64_NASM_FLAGS = -f win64 - #################################################################################### # # GCC 4.8 - This configuration is used to compile under Linux to produce -- 2.18.0.windows.1