Re: [edk2] [Patch] BaseTools Conf: Update tools_def and build_rule to remove IPF setting

2018-06-14 Thread Zhu, Yonghong 
Reviewed-by: Yonghong Zhu  

Best Regards,
Zhu Yonghong

-Original Message-
From: Gao, Liming 
Sent: Wednesday, June 13, 2018 2:47 PM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong 
Subject: [Patch] BaseTools Conf: Update tools_def and build_rule to remove IPF 
setting

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao 
Cc: Yonghong Zhu 
---
 BaseTools/Conf/build_rule.template |  40 --
 BaseTools/Conf/tools_def.template  | 773 -
 2 files changed, 813 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template 
b/BaseTools/Conf/build_rule.template
index 671d378..b2667c2 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -137,30 +137,6 @@
 
 "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
 
-[C-Code-File.COMMON.IPF]
-
-?.c
-?.C
-?.cc
-?.CC
-?.cpp
-?.Cpp
-?.CPP
-
-
-$(MAKE_FILE)
-
-
-$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
-
-
-"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
-
-
-# For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
-"$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src}
-"$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}
-
 
[C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]
 
 ?.c
@@ -251,22 +227,6 @@
 Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii 
${d_path}(+)${s_base}.i
 "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii
 
-[Assembly-Code-File.COMMON.IPF]
-
-?.s
-
-
-$(MAKE_FILE)
-
-
-$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
-
-
-"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
-Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
-# For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
-"$(ASM)" $(ASM_FLAGS) -o ${dst} ${d_path}(+)${s_base}.iii
-
 [Device-Tree-Source-File]
 
 ?.dts
diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
index 7e9c915..474eb2b 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -164,7 +164,6 @@ 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/
-DEFINE UNIXGCC_IPF_PETOOLS_PREFIX  = /opt/tiano/ia64-pc-elf/ia64-pc-elf/bin/
 #
 # Option 2: Use an environment variable
 #DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(IA32_PETOOLS_PREFIX)
@@ -187,7 +186,6 @@ DEFINE UNIXGCC_IPF_PETOOLS_PREFIX  = 
/opt/tiano/ia64-pc-elf/ia64-pc-elf/bin/
 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/
-DEFINE CYGWIN_BINIPF   = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
 
 DEFINE GCC44_IA32_PREFIX   = ENV(GCC44_BIN)
 DEFINE GCC44_X64_PREFIX= ENV(GCC44_BIN)
@@ -453,7 +451,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc
 #   https://acpica.org/downloads
 #   MYTOOLS -win32-  Requires:
 # Microsoft Visual Studio 2008 for IA32/X64
-# Microsoft Windows Server 2003 Driver Development 
Kit (Microsoft WINDDK) version 3790.1830 for IPF
 #Optional:
 # Required to build EBC drivers:
 #   Intel(r) Compiler for Efi Byte Code (Intel(r) 
EBC Compiler)
@@ -1044,34 +1041,6 @@ RELEASE_VS2005_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB 
/IGNORE:4001 /IGNORE:425
 NOOPT_VS2005_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
 
 ##
-# IPF definitions
-##
-*_VS2005_IPF_*_DLL = DEF(VS2005_DLL)
-
-*_VS2005_IPF_PP_PATH   = DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_APP_PATH  = DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_VFRPP_PATH= DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_CC_PATH   = DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_ASM_PATH  = DEF(VS2005_BIN64)\ias.exe
-*_VS2005_IPF_SLINK_PATH= DEF(VS2005_BIN64)\lib.exe
-*_VS2005_IPF_DLINK_PATH= DEF(VS2005_BIN64)\link.exe
-*_VS2005_IPF_ASLCC_PATH= DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_ASLPP_PATH= DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_ASLDLINK_PATH = DEF(VS2005_BIN64)\link.exe
-
-

[edk2] [Patch] BaseTools Conf: Update tools_def and build_rule to remove IPF setting

2018-06-13 Thread Liming Gao 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao 
Cc: Yonghong Zhu 
---
 BaseTools/Conf/build_rule.template |  40 --
 BaseTools/Conf/tools_def.template  | 773 -
 2 files changed, 813 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template 
b/BaseTools/Conf/build_rule.template
index 671d378..b2667c2 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -137,30 +137,6 @@
 
 "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
 
-[C-Code-File.COMMON.IPF]
-
-?.c
-?.C
-?.cc
-?.CC
-?.cpp
-?.Cpp
-?.CPP
-
-
-$(MAKE_FILE)
-
-
-$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
-
-
-"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
-
-
-# For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
-"$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src}
-"$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}
-
 
[C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]
 
 ?.c
@@ -251,22 +227,6 @@
 Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii 
${d_path}(+)${s_base}.i
 "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst 
${d_path}(+)${s_base}.iii
 
-[Assembly-Code-File.COMMON.IPF]
-
-?.s
-
-
-$(MAKE_FILE)
-
-
-$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
-
-
-"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
-Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
-# For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
-"$(ASM)" $(ASM_FLAGS) -o ${dst} ${d_path}(+)${s_base}.iii
-
 [Device-Tree-Source-File]
 
 ?.dts
diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
index 7e9c915..474eb2b 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -164,7 +164,6 @@ 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/
-DEFINE UNIXGCC_IPF_PETOOLS_PREFIX  = /opt/tiano/ia64-pc-elf/ia64-pc-elf/bin/
 #
 # Option 2: Use an environment variable
 #DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(IA32_PETOOLS_PREFIX)
@@ -187,7 +186,6 @@ DEFINE UNIXGCC_IPF_PETOOLS_PREFIX  = 
/opt/tiano/ia64-pc-elf/ia64-pc-elf/bin/
 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/
-DEFINE CYGWIN_BINIPF   = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
 
 DEFINE GCC44_IA32_PREFIX   = ENV(GCC44_BIN)
 DEFINE GCC44_X64_PREFIX= ENV(GCC44_BIN)
@@ -453,7 +451,6 @@ DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc
 #   https://acpica.org/downloads
 #   MYTOOLS -win32-  Requires:
 # Microsoft Visual Studio 2008 for IA32/X64
-# Microsoft Windows Server 2003 Driver Development 
Kit (Microsoft WINDDK) version 3790.1830 for IPF
 #Optional:
 # Required to build EBC drivers:
 #   Intel(r) Compiler for Efi Byte Code (Intel(r) 
EBC Compiler)
@@ -1044,34 +1041,6 @@ RELEASE_VS2005_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB 
/IGNORE:4001 /IGNORE:425
 NOOPT_VS2005_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
 
 ##
-# IPF definitions
-##
-*_VS2005_IPF_*_DLL = DEF(VS2005_DLL)
-
-*_VS2005_IPF_PP_PATH   = DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_APP_PATH  = DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_VFRPP_PATH= DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_CC_PATH   = DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_ASM_PATH  = DEF(VS2005_BIN64)\ias.exe
-*_VS2005_IPF_SLINK_PATH= DEF(VS2005_BIN64)\lib.exe
-*_VS2005_IPF_DLINK_PATH= DEF(VS2005_BIN64)\link.exe
-*_VS2005_IPF_ASLCC_PATH= DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_ASLPP_PATH= DEF(VS2005_BIN64)\cl.exe
-*_VS2005_IPF_ASLDLINK_PATH = DEF(VS2005_BIN64)\link.exe
-
-  DEBUG_VS2005_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy 
/Os /GL /FIAutoGen.h /QIPF_fr32 /Zi
-RELEASE_VS2005_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy 
/Os /GL /FIAutoGen.h /QIPF_fr32
-NOOPT_VS2005_IPF_CC_FLAGS   = /nologo /c /WX /GS- /X /W4