From: Shenglei Zhang <shenglei.zhang@intel.com>
To: edk2-devel@lists.01.org
Cc: Bob Feng <bob.c.feng@intel.com>,
Liming Gao <liming.gao@intel.com>,
Yonghong Zhu <yonghong.zhu@intel.com>
Subject: [PATCH v3 03/10] BaseTools: Update MYTOOLS
Date: Wed, 13 Feb 2019 09:42:38 +0800 [thread overview]
Message-ID: <20190213014245.380-4-shenglei.zhang@intel.com> (raw)
In-Reply-To: <20190213014245.380-1-shenglei.zhang@intel.com>
Remove MYTOOLS in tools_def.template and change
MYTOOLS to VS2015x86 in target.template.
https://bugzilla.tianocore.org/show_bug.cgi?id=1377
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
BaseTools/Conf/target.template | 2 +-
BaseTools/Conf/tools_def.template | 129 +-----------------------------
2 files changed, 5 insertions(+), 126 deletions(-)
diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index e5c31fe5a0..dc8e0f943b 100644
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -57,7 +57,7 @@ TOOL_CHAIN_CONF = Conf/tools_def.txt
# TAGNAME List Optional Specify the name(s) of the tools_def.txt TagName to use.
# If not specified, all applicable TagName tools will be
# used for the build. The list uses space character separation.
-TOOL_CHAIN_TAG = MYTOOLS
+TOOL_CHAIN_TAG = VS2015x86
# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. If not specified or set
# to zero, tool automatically detect number of processor
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index d62fe55385..8ed9abd2c9 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -108,10 +108,10 @@ DEFINE WINSDK10_BIN = ENV(WINSDK10_PREFIX)DEF(VS2017_HOST)
# are used by other toolchains. An example is that ICC on Windows normally
# uses Microsoft's nmake.exe.
-# Some MS_VS_BIN options: DEF(VS2003_BIN), DEF(VS2005_BIN), DEF(VS2005x86_BIN), DEF(VS2008_BIN), DEF(VS2008x86_BIN)
-DEFINE MS_VS_BIN = DEF(VS2005_BIN)
-# Some MS_VS_DLL options: DEF(VS2003_DLL), DEF(VS2005_DLL), DEF(VS2005x86_DLL), DEF(VS2008_DLL), DEF(VS2008x86_DLL)
-DEFINE MS_VS_DLL = DEF(VS2005_DLL)
+# Some MS_VS_BIN options: DEF(VS2008_BIN), DEF(VS2008x86_BIN)
+DEFINE MS_VS_BIN = DEF(VS2008_BIN)
+# Some MS_VS_DLL options: DEF(VS2008_DLL), DEF(VS2008x86_DLL)
+DEFINE MS_VS_DLL = DEF(VS2008_DLL)
DEFINE WINDDK_BIN16 = ENV(WINDDK3790_PREFIX)bin16
DEFINE WINDDK_BIN32 = ENV(WINDDK3790_PREFIX)x86
@@ -404,14 +404,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc
# Required to build platforms or ACPI tables:
# Intel(r) ACPI Compiler (iasl.exe) from
# https://acpica.org/downloads
-# MYTOOLS -win32- Requires:
-# Microsoft Visual Studio 2008 for IA32/X64
-# Optional:
-# Required to build EBC drivers:
-# Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
-# Required to build platforms or ACPI tables:
-# Intel(r) ACPI Compiler (iasl.exe) from
-# https://acpica.org/downloads
# VS2003xASL -win32- Requires:
# Microsoft Visual Studio .NET 2003
# Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
@@ -5983,119 +5975,6 @@ NOOPT_ICC11x86xASL_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNOR
*_ICC11x86xASL_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
-####################################################################################
-#
-# MYTOOLS
-# IA32 - Microsoft Visual Studio 2008 Team Suite
-# X64 - Microsoft Visual Studio 2008 Team Suite
-# EBC - Intel EFI Byte Code Compiler
-#
-####################################################################################
-# MYTOOLS - Settings compatible with previous versions of tools_def.template
-*_MYTOOLS_*_*_FAMILY = MSFT
-
-##################
-# ASL definitions
-##################
-*_MYTOOLS_*_ASL_PATH = DEF(DEFAULT_WIN_ASL_BIN)
-*_MYTOOLS_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS)
-*_MYTOOLS_*_ASL_OUTFLAGS = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
-*_MYTOOLS_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)
-*_MYTOOLS_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)
-*_MYTOOLS_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)
-
-
-*_MYTOOLS_*_MAKE_FLAGS = /nologo
-*_MYTOOLS_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_MYTOOLS_*_APP_FLAGS = /nologo /E /TC
-*_MYTOOLS_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_MYTOOLS_*_SLINK_FLAGS = /nologo /LTCG
-
-*_MYTOOLS_*_ASM16_PATH = DEF(VS2008_BIN)\ml.exe
-
-##################
-# IA32 definitions
-##################
-*_MYTOOLS_IA32_*_DLL = DEF(VS2008_DLL)
-
-*_MYTOOLS_IA32_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe
-*_MYTOOLS_IA32_CC_PATH = DEF(VS2008_BIN)\cl.exe
-*_MYTOOLS_IA32_SLINK_PATH = DEF(VS2008_BIN)\lib.exe
-*_MYTOOLS_IA32_DLINK_PATH = DEF(VS2008_BIN)\link.exe
-*_MYTOOLS_IA32_PP_PATH = DEF(VS2008_BIN)\cl.exe
-*_MYTOOLS_IA32_VFRPP_PATH = DEF(VS2008_BIN)\cl.exe
-*_MYTOOLS_IA32_APP_PATH = DEF(VS2008_BIN)\cl.exe
-*_MYTOOLS_IA32_ASM_PATH = DEF(VS2008_BIN)\ml.exe
-*_MYTOOLS_IA32_ASLCC_PATH = DEF(VS2008_BIN)\cl.exe
-*_MYTOOLS_IA32_ASLPP_PATH = DEF(VS2008_BIN)\cl.exe
-*_MYTOOLS_IA32_ASLDLINK_PATH = DEF(VS2008_BIN)\link.exe
-*_MYTOOLS_IA32_RC_PATH = DEF(WINSDK_BIN)\rc.exe
-
- DEBUG_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
-RELEASE_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
-NOOPT_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
- DEBUG_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd /Zi
-RELEASE_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd
-NOOPT_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd /Zi
- DEBUG_MYTOOLS_IA32_NASM_FLAGS = -Ox -f win32 -g
-RELEASE_MYTOOLS_IA32_NASM_FLAGS = -Ox -f win32
-NOOPT_MYTOOLS_IA32_NASM_FLAGS = -O0 -f win32 -g
- DEBUG_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
-RELEASE_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
-NOOPT_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb
-
-##################
-# x64 definitions
-##################
-*_MYTOOLS_X64_*_DLL = DEF(VS2008_DLL)
-
-*_MYTOOLS_X64_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe
-*_MYTOOLS_X64_CC_PATH = DEF(VS2008_BINX64)\cl.exe
-*_MYTOOLS_X64_SLINK_PATH = DEF(VS2008_BINX64)\lib.exe
-*_MYTOOLS_X64_DLINK_PATH = DEF(VS2008_BINX64)\link.exe
-*_MYTOOLS_X64_PP_PATH = DEF(VS2008_BINX64)\cl.exe
-*_MYTOOLS_X64_VFRPP_PATH = DEF(VS2008_BINX64)\cl.exe
-*_MYTOOLS_X64_APP_PATH = DEF(VS2008_BINX64)\cl.exe
-*_MYTOOLS_X64_ASM_PATH = DEF(VS2008_BINX64)\ml64.exe
-*_MYTOOLS_X64_ASLCC_PATH = DEF(VS2008_BINX64)\cl.exe
-*_MYTOOLS_X64_ASLPP_PATH = DEF(VS2008_BINX64)\cl.exe
-*_MYTOOLS_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe
-*_MYTOOLS_X64_RC_PATH = DEF(WINSDK_BIN)\rc.exe
-
- DEBUG_MYTOOLS_X64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
-RELEASE_MYTOOLS_X64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
-NOOPT_MYTOOLS_X64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
- DEBUG_MYTOOLS_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
-RELEASE_MYTOOLS_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd
-NOOPT_MYTOOLS_X64_ASM_FLAGS = /nologo /c /WX /W3 /Cx /Zd /Zi
- DEBUG_MYTOOLS_X64_NASM_FLAGS = -Ox -f win64 -g
-RELEASE_MYTOOLS_X64_NASM_FLAGS = -Ox -f win64
-NOOPT_MYTOOLS_X64_NASM_FLAGS = -O0 -f win64 -g
- DEBUG_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data
-NOOPT_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
-
-##################
-# EBC definitions
-##################
-*_MYTOOLS_EBC_*_FAMILY = INTEL
-
-*_MYTOOLS_EBC_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe
-*_MYTOOLS_EBC_PP_PATH = DEF(EBC_BIN)\iec.exe
-*_MYTOOLS_EBC_VFRPP_PATH = DEF(EBC_BIN)\iec.exe
-*_MYTOOLS_EBC_CC_PATH = DEF(EBC_BIN)\iec.exe
-*_MYTOOLS_EBC_SLINK_PATH = DEF(EBC_BIN)\link.exe
-*_MYTOOLS_EBC_DLINK_PATH = DEF(EBC_BIN)\link.exe
-*_MYTOOLS_EBC_RC_PATH = DEF(VS2005_BIN)\rc.exe
-
-*_MYTOOLS_EBC_MAKE_FLAGS = /nologo
-*_MYTOOLS_EBC_PP_FLAGS = /nologo /E /TC /FIAutoGen.h
-*_MYTOOLS_EBC_CC_FLAGS = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
-*_MYTOOLS_EBC_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
-*_MYTOOLS_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
-*_MYTOOLS_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 /MAP /ALIGN:32 /DRIVER
-
-
#
# XCODE5 support
#
--
2.18.0.windows.1
next prev parent reply other threads:[~2019-02-13 1:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 1:42 [PATCH v3 00/10] Remove unused tool chain configuration Shenglei Zhang
2019-02-13 1:42 ` [PATCH v3 01/10] BaseTools/tools_def.template: Remove CYGGCC Shenglei Zhang
2019-02-13 1:42 ` [PATCH v3 02/10] OptionRomPkg/ReadMe.txt: " Shenglei Zhang
2019-02-13 1:42 ` Shenglei Zhang [this message]
2019-02-13 1:42 ` [PATCH v3 04/10] BaseTools/tools_def.template: Remove VS2003 and VS2005 Shenglei Zhang
2019-02-13 1:42 ` [PATCH v3 05/10] OptionRomPkg/ReadMe.txt: Remove VS2005 Shenglei Zhang
2019-02-13 1:42 ` [PATCH v3 06/10] BaseTools/tools_def.template: Remove UNIXGCC Shenglei Zhang
2019-02-13 1:42 ` [PATCH v3 07/10] OvmfPkg/README: " Shenglei Zhang
2019-02-13 2:03 ` Laszlo Ersek
2019-02-13 1:42 ` [PATCH v3 08/10] BaseTools/tools_def.template: Remove ELFGCC Shenglei Zhang
2019-02-13 1:42 ` [PATCH v3 09/10] BaseTools/tools_def.template: Remove DDK3790 Shenglei Zhang
2019-02-13 1:42 ` [PATCH v3 10/10] BaseTools/build_rule.template: Remove GCCLD Shenglei Zhang
2019-02-14 0:12 ` [PATCH v3 00/10] Remove unused tool chain configuration Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190213014245.380-4-shenglei.zhang@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox