1) Changed the file including as '#include "Ipf\IpfCpuCore.i"' for Intel compiler supporting

2) Added the Intel IPF Compiler setting in the tools_def.template

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

1 files changed, 86 insertions, 0 deletions

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index c4e56618a2..54d181b11a 100644
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -46,6 +46,7 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 #   WINDDK3790x1830  - Microsoft Windows DDK 3790.1830

 #   UINIXGCC         - UINIX GCC

 #   CYGWINGCC        - CygWin GCC

+#   ICC              - Intel C Compiler V9.1

 #   MYTOOLS          - Settings compatible with previous versions of tools_def.template

 #

 ####################################################################################

@@ -486,6 +487,91 @@ RELEASE_MIXED_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd
 # *_*_*_ASL_PATH    = C:\ASL

 # 

 

+

+####################################################################################

+#

+# Intel(R) C++ Compiler Version 9.1

+#

+#   IPF  - Intel(R) C++ Compiler for Itanium(R)Version 9.1  Build 20060928 Package ID: W_CC_C_9.1.032

+#   ASL  - Intel ACPI Source Language COmpiler

+#

+####################################################################################

+*_ICC_*_*_FAMILY             = MSFT

+

+*_ICC_*_CC_NAME              = cl.exe

+*_ICC_*_SLINK_NAME           = lib.exe

+*_ICC_*_DLINK_NAME           = link.exe

+*_ICC_*_ASMLINK_NAME         = link.exe

+*_ICC_*_PP_NAME              = cl.exe

+*_ICC_*_VFRPP_NAME           = cl.exe

+*_ICC_*_APP_NAME             = cl.exe

+*_ICC_*_ASM_NAME             = ml.exe

+

+*_ICC_*_VFRPP_FLAGS            = /nologo /P /TC /DVFRCOMPILE

+##################

+# IA32 definitions

+##################

+*_ICC_IA32_PCH_NAME          = cl.exe

+*_ICC_IA32_ASM_EXT           = .asm

+

+*_ICC_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin

+*_ICC_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE

+*_ICC_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\

+

+*_ICC_IA32_APP_FLAGS         = /nologo /P /TC

+*_ICC_IA32_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h

+DEBUG_ICC_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm

+RELEASE_ICC_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h

+DEBUG_ICC_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm

+RELEASE_ICC_IA32_PCH_FLAGS   = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC

+DEBUG_ICC_IA32_ASM_FLAGS     = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

+RELEASE_ICC_IA32_ASM_FLAGS   = /nologo /W3 /WX /c /coff /Cx /Zd /W0

+*_ICC_IA32_SLINK_FLAGS       = /nologo /LTCG

+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

+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

+

+

+##################

+# IPF definitions

+##################

+*_ICC_IPF_*_FAMILY  = INTEL

+

+*_ICC_IPF_CC_NAME           = icl.exe

+*_ICC_IPF_SLINK_NAME        = xilib.exe

+*_ICC_IPF_DLINK_NAME        = xilink.exe

+*_ICC_IPF_ASMLINK_NAME      = xilink.exe

+*_ICC_IPF_PP_NAME           = icl.exe

+*_ICC_IPF_VFRPP_NAME        = icl.exe

+

+*_ICC_IPF_PCH_NAME          = icl.exe

+*_ICC_IPF_APP_NAME          = icl.exe

+*_ICC_IPF_ASM_NAME          = ias.exe

+*_ICC_IPF_ASM_EXT           = .s

+

+

+

+*_ICC_IPF_*_PATH            = C:\Program Files\Intel\Compiler\C++\9.1\Itanium\Bin

+

+*_ICC_IPF_APP_FLAGS         = /nologo /P /TC

+*_ICC_IPF_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h

+DEBUG_ICC_IPF_CC_FLAGS      = /nologo /W3 /GX /Gy /c /Od /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h

+RELEASE_ICC_IPF_CC_FLAGS    = /nologo /W3 /GX /Gy /c /Od /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h

+DEBUG_ICC_IPF_PCH_FLAGS     = /nologo /W3 /GX /Gy /c /Od /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Yc /TC /Zi

+RELEASE_ICC_IPF_PCH_FLAGS   = /nologo /W3 /GX /Gy /c /Od /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Yc /TC

+DEBUG_ICC_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32

+RELEASE_ICC_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W3 -F COFF32

+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

+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

+*_ICC_IPF_SLINK_FLAGS       = /nologo /LTCG

+

+

+##################

+# ASL definitions

+##################

+*_ICC_*_ASL_FAMILY  = INTEL

+*_ICC_*_ASL_NAME    = iasl.exe

+*_ICC_*_ASL_PATH    = C:\ASL

+

 ####################################################################################

 #

 # MYTOOLS