X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FConf%2Ftools_def.template;h=07be9dec58a4f04ec9a2d2a7440f47b43208747f;hp=99d9a7b941691f1461f63730db21c9bb3334c1a5;hb=3b660b0c8b70cb12b7406467a8dbc6ab9d2cee0f;hpb=b609c89b77876ef144a2acdb31defbf1881437c2

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 99d9a7b941..07be9dec58 100644
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2006, Intel Corporation
+#  Copyright (c) 2006 - 2007 Intel Corporation. <BR>
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -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
 #
 ####################################################################################
@@ -59,10 +60,11 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 *_VS2003_IA32_*_FAMILY          = MSFT
 
 *_VS2003_IA32_CC_NAME           = cl.exe  
-*_VS2003_IA32_VFR_NAME          = cl.exe
+*_VS2003_IA32_VFRPP_NAME        = cl.exe
 *_VS2003_IA32_SLINK_NAME        = lib.exe
 *_VS2003_IA32_DLINK_NAME        = link.exe
 *_VS2003_IA32_ASMLINK_NAME      = link.exe
+*_VS2003_IA32_APP_NAME          = cl.exe 
 *_VS2003_IA32_PP_NAME           = cl.exe 
 *_VS2003_IA32_ASM_NAME          = ml.exe
 *_VS2003_IA32_ASM_EXT           = .asm
@@ -74,8 +76,9 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 *_VS2003_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
 *_VS2003_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
 
+*_VS2003_IA32_APP_FLAGS         = /nologo /P /TC 
 *_VS2003_IA32_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h 
-*_VS2003_IA32_VFR_FLAGS         = /nologo /P /TC /DVFRCOMPILE
+*_VS2003_IA32_VFRPP_FLAGS       = /nologo /P /TC /DVFRCOMPILE
 DEBUG_VS2003_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /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_VS2003_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /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_VS2003_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /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
@@ -95,15 +98,17 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 *_WINDDK3790x1830_*_*_FAMILY        = MSFT
 
 *_WINDDK3790x1830_*_CC_NAME         = cl.exe
-*_WINDDK3790x1830_*_VFR_NAME        = cl.exe
+*_WINDDK3790x1830_*_VFRPP_NAME      = cl.exe
 *_WINDDK3790x1830_*_SLINK_NAME      = lib.exe
 *_WINDDK3790x1830_*_DLINK_NAME      = link.exe
 *_WINDDK3790x1830_*_ASMLINK_NAME    = link.exe
 *_WINDDK3790x1830_*_PP_NAME         = cl.exe
+*_WINDDK3790x1830_*_APP_NAME        = cl.exe
 *_WINDDK3790x1830_*_PCH_NAME        = cl.exe
 
+*_WINDDK3790x1830_*_APP_FLAGS       = /nologo /P /TC
 *_WINDDK3790x1830_*_SLINK_FLAGS     = /nologo /LTCG
-*_WINDDK3790x1830_*_VFR_FLAGS       = /nologo /P /TC /DVFRCOMPILE
+*_WINDDK3790x1830_*_VFRPP_FLAGS     = /nologo /P /TC /DVFRCOMPILE
 ##################
 # IA32 definitions
 ##################
@@ -145,17 +150,19 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 ##################
 # IPF definitions
 ##################
-*_WINDDK3790x1830_IPF_APP_NAME      = cl.exe
-*_WINDDK3790x1830_IPF_ASM_NAME      = ias.exe
-*_WINDDK3790x1830_IPF_ASM_EXT       = .s
-*_WINDDK3790x1830_IPF_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86
-
-*_WINDDK3790x1830_IPF_APP_FLAGS     = /nologo /P /TC
-*_WINDDK3790x1830_IPF_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h
-*_WINDDK3790x1830_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h
-*_WINDDK3790x1830_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC
-*_WINDDK3790x1830_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4
-*_WINDDK3790x1830_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /OPT:REF /IGNORE:4086 /MAP /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb 
+*_WINDDK3790x1830_IPF_ASM_NAME          = ias.exe
+*_WINDDK3790x1830_IPF_ASM_EXT           = .s
+*_WINDDK3790x1830_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86
+
+*_WINDDK3790x1830_IPF_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h
+DEBUG_WINDDK3790x1830_IPF_CC_FLAGS      = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi
+RELEASE_WINDDK3790x1830_IPF_CC_FLAGS    = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h
+DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS     = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi
+RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS   = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC
+DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4 -d debug
+RELEASE_WINDDK3790x1830_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W4
+DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /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_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /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 
 
 ##################
 # EBC definitions
@@ -205,12 +212,14 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 *_VS2005PRO_*_DLINK_NAME     = link.exe
 *_VS2005PRO_*_ASMLINK_NAME   = link.exe
 *_VS2005PRO_*_PP_NAME        = cl.exe
-*_VS2005PRO_*_VFR_NAME       = cl.exe
+*_VS2005PRO_*_APP_NAME       = cl.exe
+*_VS2005PRO_*_VFRPP_NAME     = cl.exe
 *_VS2005PRO_*_PCH_NAME       = cl.exe
 
 *_VS2005PRO_*_SLINK_FLAGS       = /NOLOGO /LTCG
+*_VS2005PRO_*_APP_FLAGS         = /nologo /P /TC
 *_VS2005PRO_*_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h 
-*_VS2005PRO_*_VFR_FLAGS         = /nologo /P /TC /DVFRCOMPILE
+*_VS2005PRO_*_VFRPP_FLAGS       = /nologo /P /TC /DVFRCOMPILE
 
 ##################
 # IA32 definitions
@@ -279,30 +288,34 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #
 ####################################################################################
 
+
 ####################################################################################
 #
-# UNIX GCC
+# MINGW32
+#
+# You can build a mingw32 toolchain by downloading the script package called
+# x86-mingw32-build.sh from the mingw project home page. It will walk you through
+# some options and explain what to do.
 #
 ####################################################################################
 
-*_UNIXGCC_IA32_*_FAMILY     = GCC
-
-*_UNIXGCC_IA32_CC_NAME      = gcc
-*_UNIXGCC_IA32_SLINK_NAME   = ar
-*_UNIXGCC_IA32_DLINK_NAME   = ld
-*_UNIXGCC_IA32_ASM_NAME     = gcc
-*_UNIXGCC_IA32_PP_NAME      = gcc
-*_UNIXGCC_IA32_VFR_NAME     = gcc
+*_MINGW_*_*_FAMILY        = GCC
 
-*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h
-*_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}
-*_UNIXGCC_IA32_ASM_FLAGS    = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h
-*_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
-*_UNIXGCC_*_VFR_FLAGS        = -x c -E -P -DVFRCOMPILE
+*_MINGW_IA32_CC_NAME      = gcc
+*_MINGW_IA32_SLINK_NAME   = ar
+*_MINGW_IA32_DLINK_NAME   = ld
+*_MINGW_IA32_ASM_NAME     = gcc
+*_MINGW_IA32_PP_NAME      = gcc
+*_MINGW_IA32_VFRPP_NAME   = gcc
 
-*_UNIXGCC_IA32_ASM_EXT      = .S
-*_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
+*_MINGW_*_CC_FLAGS        = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h
+*_MINGW_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT} --file-alignment 0x20 --section-alignment 0x20 
+*_MINGW_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h  -DASM_PFX(name)=_##name
+*_MINGW_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
+*_MINGW_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE
+*_MINGW_*_ASM_EXT         = .S
 
+*_MINGW_IA32_*_PATH       = /opt/mingw/i386-mingw32/bin/
 
 ####################################################################################
 #
@@ -318,18 +331,21 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_UNIXGCC_IA32_DLINK_NAME   = ld
 *_UNIXGCC_IA32_ASM_NAME     = gcc
 *_UNIXGCC_IA32_PP_NAME      = gcc
+*_UNIXGCC_IA32_VFRPP_NAME   = gcc
 
 *_UNIXGCC_X64_CC_NAME       = gcc
 *_UNIXGCC_X64_SLINK_NAME    = ar
 *_UNIXGCC_X64_DLINK_NAME    = ld
 *_UNIXGCC_X64_ASM_NAME      = gcc
 *_UNIXGCC_X64_PP_NAME       = gcc
+*_UNIXGCC_X64_VFRPP_NAME    = gcc
 
-*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h
-*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64
-*_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}
-*_UNIXGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h
+*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h
+*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64
+*_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT} --file-alignment 0x20 --section-alignment 0x20 
+*_UNIXGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name
 *_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
+*_UNIXGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE
 *_UNIXGCC_*_ASM_EXT         = .S
 
 *_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
@@ -350,26 +366,77 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_CYGWINGCC_IA32_DLINK_NAME   = ld
 *_CYGWINGCC_IA32_ASM_NAME     = gcc
 *_CYGWINGCC_IA32_PP_NAME      = gcc
-*_CYGWINGCC_IA32_VFR_NAME     = gcc
+*_CYGWINGCC_IA32_VFRPP_NAME   = gcc
 
 *_CYGWINGCC_X64_CC_NAME       = gcc
 *_CYGWINGCC_X64_SLINK_NAME    = ar
 *_CYGWINGCC_X64_DLINK_NAME    = ld
 *_CYGWINGCC_X64_ASM_NAME      = gcc
 *_CYGWINGCC_X64_PP_NAME       = gcc
+*_CYGWINGCC_X64_VFRPP_NAME    = gcc
 
 *_CYGWINGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h
 *_CYGWINGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64
-*_CYGWINGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}
-*_CYGWINGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h
+*_CYGWINGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT} --file-alignment 0x20 --section-alignment 0x20 
+*_CYGWINGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name
 *_CYGWINGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
-*_CYGWINGCC_*_VFR_FLAGS       = -x c -E -P -DVFRCOMPILE
+*_CYGWINGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE
 *_CYGWINGCC_*_ASM_EXT         = .S
 
 *_CYGWINGCC_IA32_*_PATH       = c:/Cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
 *_CYGWINGCC_X64_*_PATH        = c:/Cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin
 *_CYGWINGCC_*_*_DPATH         = c:/Cygwin/bin
 
+####################################################################################
+#
+# Elf GCC - This configuration is used to compile on Linux boxes to produce elf
+#           binaries.
+#
+####################################################################################
+
+
+*_ELFGCC_*_*_FAMILY        = GCC
+
+*_ELFGCC_IA32_CC_NAME      = gcc
+*_ELFGCC_IA32_SLINK_NAME   = ar
+*_ELFGCC_IA32_DLINK_NAME   = ld
+*_ELFGCC_IA32_ASM_NAME     = gcc
+*_ELFGCC_IA32_PP_NAME      = gcc
+*_ELFGCC_IA32_VFRPP_NAME   = gcc
+
+*_ELFGCC_IA32_CC_FLAGS     = -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include ${DEST_DIR_DEBUG}/AutoGen.h -DSTRING_ARRAY_NAME=${BASE_NAME}Strings
+*_ELFGCC_*_DLINK_FLAGS     = -nostdlib -n -q -Ttext 0x220 --entry ${ENTRYPOINT} -u ${ENTRYPOINT}
+*_ELFGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=name
+*_ELFGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
+*_ELFGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE
+*_ELFGCC_*_ASM_EXT         = .S
+
+*_ELFGCC_IA32_*_PATH       = /usr/bin
+
+####################################################################################
+#
+# UnixPkg CYGWIN GCC - This configuration is used to compile on CYGWIN environment for UnixPkg.
+#
+####################################################################################
+
+
+*_UNIXPKGCYGWINGCC_*_*_FAMILY        = GCC
+
+*_UNIXPKGCYGWINGCC_IA32_CC_NAME      = gcc
+*_UNIXPKGCYGWINGCC_IA32_SLINK_NAME   = ar
+*_UNIXPKGCYGWINGCC_IA32_DLINK_NAME   = ld
+*_UNIXPKGCYGWINGCC_IA32_ASM_NAME     = gcc
+*_UNIXPKGCYGWINGCC_IA32_PP_NAME      = gcc
+*_UNIXPKGCYGWINGCC_IA32_VFRPP_NAME   = gcc
+
+*_UNIXPKGCYGWINGCC_IA32_CC_FLAGS     = -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include ${DEST_DIR_DEBUG}/AutoGen.h -DSTRING_ARRAY_NAME=${BASE_NAME}Strings -IC:/cygwin/usr/X11R6/include
+*_UNIXPKGCYGWINGCC_*_DLINK_FLAGS     = -nostdlib -n -q -Ttext 0x220 --entry ${ENTRYPOINT} -u ${ENTRYPOINT}
+*_UNIXPKGCYGWINGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name
+*_UNIXPKGCYGWINGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
+*_UNIXPKGCYGWINGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE
+*_UNIXPKGCYGWINGCC_*_ASM_EXT         = .S
+
+*_UNIXPKGCYGWINGCC_IA32_*_PATH       = C:/cygwin/bin
 
 ####################################################################################
 #
@@ -391,7 +458,7 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_MIXED_X64_PP_NAME      = cl.exe
 
 *_MIXED_X64_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64
-*_MIXED_*_DLINK_FLAGS    = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}
+*_MIXED_*_DLINK_FLAGS    = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT} --file-alignment 0x20 --section-alignment 0x20 
 *_MIXED_X64_PP_FLAGS     = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h 
 
 *_MIXED_X64_ASM_NAME     = ml64.exe
@@ -444,6 +511,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 /QIA64_fr32 /W4 /WX /GX /Gy /c /Od /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Zi
+RELEASE_ICC_IPF_CC_FLAGS    = /nologo /QIA64_fr32 /W4 /WX /GX /Gy /c /Od /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h
+#DEBUG_ICC_IPF_PCH_FLAGS     = /nologo /QIA64_fr32 /W4 /WX /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 /QIA64_fr32 /W4 /WX /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
@@ -461,11 +613,11 @@ RELEASE_MIXED_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd
 *_MYTOOLS_*_DLINK_NAME           = link.exe
 *_MYTOOLS_*_ASMLINK_NAME         = link.exe
 *_MYTOOLS_*_PP_NAME              = cl.exe 
-*_MYTOOLS_*_VFR_NAME             = cl.exe 
+*_MYTOOLS_*_VFRPP_NAME           = cl.exe 
 *_MYTOOLS_*_APP_NAME             = cl.exe
 *_MYTOOLS_*_ASM_NAME             = ml.exe
 
-*_MYTOOLS_*_VFR_FLAGS            = /nologo /P /TC /DVFRCOMPILE
+*_MYTOOLS_*_VFRPP_FLAGS          = /nologo /P /TC /DVFRCOMPILE
 ##################
 # IA32 definitions
 ##################
@@ -514,19 +666,23 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 ##################
 # IPF definitions
 ##################
-*_MYTOOLS_IPF_PCH_NAME      = cl.exe
-*_MYTOOLS_IPF_ASM_NAME      = ias.exe
-*_MYTOOLS_IPF_ASM_EXT       = .s
-
-*_MYTOOLS_IPF_*_PATH        = C:\WINDDK\3790.1830\bin\win64\x86
-
-*_MYTOOLS_IPF_APP_FLAGS     = /nologo /P /TC
-*_MYTOOLS_IPF_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h
-*_MYTOOLS_IPF_CC_FLAGS      = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h
-*_MYTOOLS_IPF_PCH_FLAGS     = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /D EFI64 /O1i /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC
-*_MYTOOLS_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4
-*_MYTOOLS_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /OPT:REF /IGNORE:4086 /MAP /MACHINE:IA64 /ENTRY:${ENTRYPOINT} /SUBSYSTEM:CONSOLE /MAP:${DEST_DIR_DEBUG}/${BASE_NAME}.map /PDB:${DEST_DIR_DEBUG}/${BASE_NAME}.pdb 
-*_MYTOOLS_IPF_SLINK_FLAGS   = /nologo /LTCG
+*_MYTOOLS_IPF_PCH_NAME          = cl.exe
+*_MYTOOLS_IPF_ASM_NAME          = ias.exe
+*_MYTOOLS_IPF_ASM_EXT           = .s
+
+*_MYTOOLS_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86
+
+*_MYTOOLS_IPF_APP_FLAGS         = /nologo /P /TC
+*_MYTOOLS_IPF_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h
+DEBUG_MYTOOLS_IPF_CC_FLAGS      = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi
+RELEASE_MYTOOLS_IPF_CC_FLAGS    = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h
+DEBUG_MYTOOLS_IPF_PCH_FLAGS     = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi
+RELEASE_MYTOOLS_IPF_PCH_FLAGS   = /GS- /nologo /QIPF_fr32 /W4 /WX /EHs-c- /Gy /c /Os /GL /X /D EFI64 /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC
+DEBUG_MYTOOLS_IPF_ASM_FLAGS     = -N us -X explicit -M ilp64 -N so -W4 -d debug
+RELEASE_MYTOOLS_IPF_ASM_FLAGS   = -N us -X explicit -M ilp64 -N so -W4
+DEBUG_MYTOOLS_IPF_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /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_MYTOOLS_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /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
+*_MYTOOLS_IPF_SLINK_FLAGS       = /nologo /LTCG
 
 ##################
 # EBC definitions