1. Redirect ICC_IA32_*_PATH from C:\Program Files\Microsoft Visual Studio .NET 2003...

2. Add ICC X64 definition to enable ICC X64 build.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3786 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 87e5c72eeb6b237bd4b1713680a4c3c832df0e6b..073018d4819ed1134beaa7554843d4927023a94e 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -678,30 +678,32 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #\r
 ####################################################################################\r
 #   ICC              - Intel C Compiler V9.1\r
-*_ICC_*_*_FAMILY                    = MSFT\r
+*_ICC_*_*_FAMILY                    = INTEL\r
 \r
-*_ICC_IA32_*_PATH                   = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-*_ICC_IA32_*_DPATH                  = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
-*_ICC_IA32_ASMLINK_PATH             = C:\WINDDK\3790.1830\bin\bin16\r
+*_ICC_IA32_*_PATH                   = C:\Program Files\Intel\Compiler\C++\9.1\IA32\Bin\r
+*_ICC_X64_*_PATH                   = C:\Program Files\Intel\Compiler\C++\9.1\EM64T\Bin\r
 *_ICC_IPF_*_PATH                    = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin\r
 DEBUG_ICC_*_ASL_PATH                = C:\ASL\r
 RELEASE_ICC_*_ASL_PATH              = C:\ASL\r
 \r
-*_ICC_*_CC_NAME                     = cl.exe\r
-*_ICC_*_SLINK_NAME                  = lib.exe\r
-*_ICC_*_DLINK_NAME                  = link.exe\r
-*_ICC_*_ASMLINK_NAME                = link.exe\r
-*_ICC_*_PP_NAME                     = cl.exe\r
-*_ICC_*_VFRPP_NAME                  = cl.exe\r
-*_ICC_*_APP_NAME                    = cl.exe\r
-*_ICC_*_ASM_NAME                    = ml.exe\r
-\r
 *_ICC_*_VFRPP_FLAGS                      = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_ICC_IA32_PCH_NAME                 = cl.exe\r
+*_ICC_IA32_ASM_FAMILY                  = MSFT\r
+*_ICC_IA32_ASM_PATH                    = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+*_ICC_IA32_PCH_NAME                    = icl.exe\r
+\r
+*_ICC_IA32_CC_NAME                     = icl.exe\r
+*_ICC_IA32_SLINK_NAME                  = xilib.exe\r
+*_ICC_IA32_DLINK_NAME                  = xilink.exe\r
+*_ICC_IA32_ASMLINK_NAME                = xilink.exe\r
+*_ICC_IA32_PP_NAME                     = icl.exe\r
+*_ICC_IA32_VFRPP_NAME                  = icl.exe\r
+*_ICC_IA32_APP_NAME                    = icl.exe\r
+*_ICC_IA32_ASM_NAME                    = ml.exe\r
+\r
 \r
 *_ICC_IA32_APP_FLAGS                     = /nologo /E /TC\r
 *_ICC_IA32_PP_FLAGS                      = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
@@ -709,12 +711,42 @@ DEBUG_ICC_IA32_CC_FLAGS                  = /nologo /W4 /WX /Gy /c /D UNICODE /O1
 RELEASE_ICC_IA32_CC_FLAGS                = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
 DEBUG_ICC_IA32_PCH_FLAGS                 = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC /Zi /Gm\r
 RELEASE_ICC_IA32_PCH_FLAGS               = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Yc /TC\r
-DEBUG_ICC_IA32_ASM_FLAGS                 = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
-RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
-*_ICC_IA32_SLINK_FLAGS                   = /nologo /LTCG\r
+DEBUG_ICC_IA32_ASM_FLAGS                 = /nologo /W3 /WX /c /Zd /W0 /Zi\r
+RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /W3 /WX /c /Zd /W0\r
+*_ICC_IA32_SLINK_FLAGS                   = /nologo\r
 DEBUG_ICC_IA32_DLINK_FLAGS               = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
 \r
+##################\r
+# X64 definitions\r
+##################\r
+*_ICC_X64_ASM_FAMILY                  = MSFT\r
+*_ICC_X64_ASM_PATH                    = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
+*_ICC_X64_PCH_NAME                    = icl.exe\r
+\r
+*_ICC_X64_CC_NAME                     = icl.exe\r
+*_ICC_X64_SLINK_NAME                  = xilib.exe\r
+*_ICC_X64_DLINK_NAME                  = xilink.exe\r
+*_ICC_X64_ASMLINK_NAME                = xilink.exe\r
+*_ICC_X64_PP_NAME                     = icl.exe\r
+*_ICC_X64_VFRPP_NAME                  = icl.exe\r
+*_ICC_X64_APP_NAME                    = icl.exe\r
+*_ICC_X64_ASM_NAME                    = ml64.exe\r
+\r
+\r
+*_ICC_X64_SLINK_FLAGS                = /nologo /LTCG\r
+*_ICC_X64_APP_FLAGS                  = /nologo /E /TC\r
+*_ICC_X64_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+DEBUG_ICC_X64_CC_FLAGS               = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
+RELEASE_ICC_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
+DEBUG_ICC_X64_PCH_FLAGS              = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
+RELEASE_ICC_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
+DEBUG_ICC_X64_ASM_FLAGS              = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_ICC_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd\r
+DEBUG_ICC_X64_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
+RELEASE_ICC_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
+\r
+\r
 ##################\r
 # IPF definitions\r
 ##################\r
@@ -734,14 +766,14 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_IPF_APP_FLAGS                      = /nologo /E /TC\r
 *_ICC_IPF_PP_FLAGS                       = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
 DEBUG_ICC_IPF_CC_FLAGS                   = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
-RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 \r
+RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /W4 /WX /GX /Gy /c /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
 #DEBUG_ICC_IPF_PCH_FLAGS                  = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
 #RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /W4 /WX /GX /Gy /c /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC\r
 DEBUG_ICC_IPF_ASM_FLAGS                  = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
 RELEASE_ICC_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
 DEBUG_ICC_IPF_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
 RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:64 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
-*_ICC_IPF_SLINK_FLAGS                    = /nologo /LTCG\r
+*_ICC_IPF_SLINK_FLAGS                    = /nologo\r
 \r
 ##################\r
 # ASL definitions\r
@@ -763,8 +795,8 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   MYTOOLS          - Settings compatible with previous versions of tools_def.template\r
 *_MYTOOLS_*_*_FAMILY                = MSFT\r
 \r
-DEBUG_MYTOOLS_*_TIANO_PATH          = \r
-RELEASE_MYTOOLS_*_TIANO_PATH        = \r
+DEBUG_MYTOOLS_*_TIANO_PATH          =\r
+RELEASE_MYTOOLS_*_TIANO_PATH        =\r
 *_MYTOOLS_IA32_*_PATH               = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
 *_MYTOOLS_IA32_*_DPATH              = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
 *_MYTOOLS_IA32_ASMLINK_PATH         = C:\WINDDK\3790.1830\bin\bin16\r