Fix Bug to convert low Hex string to handle L'A' - L'F'

[mirror_edk2.git] / BaseTools / Conf / tools_def.template

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index cc1dd0bb69b040d918fc2eb9f7bfaf1e541e15cc..6c1be1d93da091a2f4241022a0b154f3305ea816 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2006-2007, Intel Corporation\r
+#  Copyright (c) 2006-2009, Intel Corporation\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -47,9 +47,11 @@ DEFINE EBC_BIN    = C:\Program Files\Intel\EBC\Bin
 \r
 DEFINE ELFGCC_BIN    = /usr/bin\r
 \r
+#\r
 # Option 1: Hard coded full path to compiler suite\r
-#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin/\r
+DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/\r
+DEFINE UNIXGCC_IASL                = /usr/bin/iasl\r
 #\r
 # Option 2: Use an environment variable\r
 #DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(IA32_PETOOLS_PREFIX)\r
@@ -63,15 +65,18 @@ DEFINE ELFGCC_BIN    = /usr/bin
 # Links needed: gcc, ar & ld\r
 #DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(WORKSPACE)/BaseTools/Bin/gcc/Ia32\r
 #DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(WORKSPACE)/BaseTools/Bin/gcc/X64\r
-\r
-DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+#\r
+# Option 5: Install programs under user's home directory\r
+#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(HOME)/programs/gcc/ia32/bin/i686-pc-mingw32-\r
+#DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(HOME)/programs/gcc/x64/bin/x86_64-pc-mingw32-\r
+#DEFINE UNIXGCC_IASL                = ENV(HOME)/programs/iasl\r
+#\r
 \r
 DEFINE CYGWIN_BIN    = c:/cygwin/bin\r
 DEFINE CYGWIN_BIN32  = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
 DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
 \r
-DEFINE ASL_BIN = C:\ASL\r
+DEFINE ASL_BIN           = C:\ASL\r
 \r
 ####################################################################################\r
 #\r
@@ -144,7 +149,6 @@ DEFINE ASL_BIN = C:\ASL
 *_VS2003_IA32_APP_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_PP_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASM_PATH              = DEF(VSNET2003_BIN)\ml.exe\r
-*_VS2003_IA32_PCH_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASLCC_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASLPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASLDLINK_PATH         = DEF(VSNET2003_BIN)\link.exe\r
@@ -156,8 +160,6 @@ DEFINE ASL_BIN = C:\ASL
       *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
   DEBUG_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm\r
 RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-\r
-  DEBUG_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
 RELEASE_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd\r
       *_VS2003_IA32_SLINK_FLAGS          = /nologo /LTCG\r
@@ -173,9 +175,6 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   VS2005PRO           - Microsoft Visual Studio 2005 Professional Edition\r
 *_VS2005PRO_*_*_FAMILY              = MSFT\r
 \r
-*_VS2005PRO_*_TIANO_PATH            = TianoCompress.exe\r
-*_VS2005PRO_*_TIANO_GUID                 = A31280AD-481E-41B6-95E8-127F4C984779\r
-\r
 *_VS2005PRO_*_ASL_PATH              = DEF(ASL_BIN)\iasl.exe\r
 *_VS2005PRO_*_MAKE_PATH             = DEF(VS2005PRO_BIN)\nmake.exe\r
 \r
@@ -237,9 +236,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 #   VS2005TEAMSUITE           - Microsoft Visual Studio 2005 Team Suite Edition\r
 *_VS2005TEAMSUITE_*_*_FAMILY        = MSFT\r
 \r
-*_VS2005TEAMSUITE_*_TIANO_PATH      = TianoCompress.exe\r
-*_VS2005TEAMSUITE_*_TIANO_GUID           = A31280AD-481E-41B6-95E8-127F4C984779\r
-\r
 *_VS2005TEAMSUITE_*_ASL_PATH        = DEF(ASL_BIN)\iasl.exe\r
 *_VS2005TEAMSUITE_*_MAKE_PATH       = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
 \r
@@ -354,7 +350,6 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_IA32_PP_PATH      = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_VFRPP_PATH   = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_APP_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
-*_WINDDK3790x1830_IA32_PCH_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_ASM_PATH     = DEF(WINDDK_BIN32)\ml.exe\r
 *_WINDDK3790x1830_IA32_ASLCC_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_ASLPP_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
@@ -362,8 +357,6 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
   DEBUG_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_WINDDK3790x1830_IA32_PCH_FLAGS   = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
 RELEASE_WINDDK3790x1830_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /coff /Cx /Zd\r
   DEBUG_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
@@ -379,7 +372,6 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_X64_PP_PATH      = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_VFRPP_PATH   = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_APP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
-*_WINDDK3790x1830_X64_PCH_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_ASM_PATH     = DEF(WINDDK_BINX64)\ml64.exe\r
 *_WINDDK3790x1830_X64_ASLCC_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_ASLPP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
@@ -387,8 +379,6 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_WINDDK3790x1830_X64_PCH_FLAGS    = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_WINDDK3790x1830_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
   DEBUG_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
@@ -403,7 +393,6 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_IPF_PP_PATH      = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_VFRPP_PATH   = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_APP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
-*_WINDDK3790x1830_IPF_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_ASM_PATH     = DEF(WINDDK_BIN64)\ias.exe\r
 *_WINDDK3790x1830_IPF_ASLCC_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_ASLPP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
@@ -412,8 +401,6 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi\r
 RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32\r
-  DEBUG_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi\r
-RELEASE_WINDDK3790x1830_IPF_PCH_FLAGS    = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
 RELEASE_WINDDK3790x1830_IPF_ASM_FLAGS    = -N us -X explicit -M ilp64 -N so -W4\r
   DEBUG_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /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
@@ -442,33 +429,44 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   UINIXGCC         - UINIX GCC\r
 *_UNIXGCC_*_*_FAMILY               = GCC\r
 \r
-*_UNIXGCC_*_DLINK_FLAGS                  = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie\r
+*_UNIXGCC_*_ASLCC_FLAGS                  = -x c\r
+*_UNIXGCC_*_DLINK_FLAGS                  = DEF(UNIXGCC_DLINK_FLAGS_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+*_UNIXGCC_*_ASLDLINK_FLAGS               = DEF(UNIXGCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
 *_UNIXGCC_*_ASM_FLAGS                    = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 *_UNIXGCC_*_PP_FLAGS                     = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_UNIXGCC_*_ASLPP_FLAGS                  = -x c -E -P\r
 *_UNIXGCC_*_VFRPP_FLAGS                  = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
 *_UNIXGCC_*_MAKE_PATH                    = make\r
+*_UNIXGCC_*_ASL_PATH                     = DEF(UNIXGCC_IASL)\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_UNIXGCC_IA32_CC_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IA32_SLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/ar\r
-*_UNIXGCC_IA32_DLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/ld\r
-*_UNIXGCC_IA32_ASM_PATH             = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IA32_PP_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IA32_VFRPP_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_CC_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IA32_ASLCC_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IA32_SLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ar\r
+*_UNIXGCC_IA32_DLINK_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ld\r
+*_UNIXGCC_IA32_ASLDLINK_PATH        = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)ld\r
+*_UNIXGCC_IA32_ASM_PATH             = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IA32_PP_PATH              = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IA32_ASLPP_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IA32_VFRPP_PATH           = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
 \r
-*_UNIXGCC_IA32_CC_FLAGS                  = -O2 -falign-functions -falign-jumps -falign-loops -freorder-blocks -freorder-blocks-and-partition -falign-labels -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h\r
+*_UNIXGCC_IA32_CC_FLAGS                  = -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -D EFI32\r
 \r
 ##################\r
 # X64 definitions\r
 ##################\r
-*_UNIXGCC_X64_CC_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_X64_SLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/ar\r
-*_UNIXGCC_X64_DLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/ld\r
-*_UNIXGCC_X64_ASM_PATH              = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_X64_PP_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_X64_VFRPP_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_X64_CC_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_X64_ASLCC_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_X64_SLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ar\r
+*_UNIXGCC_X64_DLINK_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ld\r
+*_UNIXGCC_X64_ASLDLINK_PATH         = DEF(UNIXGCC_X64_PETOOLS_PREFIX)ld\r
+*_UNIXGCC_X64_ASM_PATH              = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_X64_PP_PATH               = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_X64_ASLPP_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_X64_VFRPP_PATH            = DEF(UNIXGCC_X64_PETOOLS_PREFIX)gcc\r
 \r
 *_UNIXGCC_X64_CC_FLAGS                   = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address -Wno-array-bounds -c -include AutoGen.h -D_EFI_P64\r
 \r
@@ -480,7 +478,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 #   CYGWINGCC        - CygWin GCC\r
 *_CYGWINGCC_*_*_FAMILY              = GCC\r
 \r
-*_CYGWINGCC_*_*_DPATH               = DEF(CYGWIN_BIN)\r
+*_CYGWINGCC_*_*_DLL                 = DEF(CYGWIN_BIN)\r
 *_CYGWINGCC_*_ASL_PATH              = DEF(ASL_BIN)/iasl.exe\r
 *_CYGWINGCC_*_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
 \r
@@ -598,14 +596,13 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC\r
 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h\r
 \r
-*_ICC_*_ASLCC_FLAGS                      = /Y- /TC /WX-\r
-*_ICC_*_ASLDLINK_FLAGS                   = /NODEFAULTLIB /ENTRY:main /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc\r
+*_ICC_*_ASLCC_FLAGS                      = /Y- /TC /WX- /Dmain=ReferenceAcpiTable\r
+*_ICC_*_ASLDLINK_FLAGS                   = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc\r
 *_ICC_*_ASLPP_FLAGS                      = /nologo /EP /C\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_ICC_IA32_PCH_PATH                 = DEF(ICC_BIN32)\icl.exe\r
 *_ICC_IA32_CC_PATH                  = DEF(ICC_BIN32)\icl.exe\r
 *_ICC_IA32_SLINK_PATH               = DEF(ICC_BIN32)\xilib.exe\r
 # xilib.exe needs lib.exe from Visual Studio\r
@@ -623,8 +620,6 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
   DEBUG_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm\r
 RELEASE_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF\r
-  DEBUG_ICC_IA32_PCH_FLAGS               = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Yc /TC /Zi /Gm\r
-RELEASE_ICC_IA32_PCH_FLAGS               = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Yc /TC\r
   DEBUG_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd /Zi\r
 RELEASE_ICC_IA32_ASM_FLAGS               = /nologo /c /WX /W3 /Zd\r
       *_ICC_IA32_SLINK_FLAGS             = /nologo\r
@@ -635,7 +630,6 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 ##################\r
 # X64 definitions\r
 ##################\r
-*_ICC_X64_PCH_PATH                  = DEF(ICC_BINX64)\icl.exe\r
 *_ICC_X64_CC_PATH                   = DEF(ICC_BINX64)\icl.exe\r
 *_ICC_X64_SLINK_PATH                = DEF(ICC_BINX64)\xilib.exe\r
 # xilib.exe needs lib.exe from Visual Studio\r
@@ -652,8 +646,6 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
 RELEASE_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-  DEBUG_ICC_X64_PCH_FLAGS                = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_ICC_X64_PCH_FLAGS                = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
   DEBUG_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_ICC_X64_ASM_FLAGS                = /nologo /c /WX /W3 /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:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
@@ -673,7 +665,6 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_IPF_DLINK_PATH                = DEF(ICC_BIN64)\xilink.exe\r
 *_ICC_IPF_PP_PATH                   = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_VFRPP_PATH                = DEF(ICC_BIN64)\icl.exe\r
-*_ICC_IPF_PCH_PATH                  = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_APP_PATH                  = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_ASM_PATH                  = DEF(ICC_BIN64)\ias.exe\r
 *_ICC_IPF_ASLCC_PATH                = DEF(ICC_BIN64)\icl.exe\r
@@ -682,8 +673,6 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
 RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
-  DEBUG_ICC_IPF_PCH_FLAGS                = /nologo /c /WX /W4 /GX /Gy /Os /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zi\r
-RELEASE_ICC_IPF_PCH_FLAGS                = /nologo /c /WX /W4 /GX /Gy /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:$(IMAGE_ENTRY_POINT) /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
@@ -702,9 +691,6 @@ 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
-*_MYTOOLS_*_TIANO_PATH              = TianoCompress.exe\r
-*_MYTOOLS_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
-\r
 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
 *_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
@@ -713,10 +699,6 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_*_PP_FLAGS                     = /nologo /E /TC /FIAutoGen.h\r
 *_MYTOOLS_*_SLINK_FLAGS                  = /nologo /LTCG\r
 \r
-*_MYTOOLS_*_ASM16_PATH            = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
-  DEBUG_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
-RELEASE_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd\r
-\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -819,8 +801,13 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\r
 # Asl Compiler definitions\r
 ##################\r
-*_*_*_ASLCC_FLAGS                  = /GL- /Y- /TC\r
-*_*_*_ASLDLINK_FLAGS               = /NODEFAULTLIB /ENTRY:main\r
+*_*_*_ASLCC_FLAGS                  = /GL- /Y- /TC /Dmain=ReferenceAcpiTable\r
+*_*_*_ASLDLINK_FLAGS               = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE\r
 *_*_*_ASLPP_FLAGS                  = /nologo /EP /C\r
 *_*_*_ASL_FLAGS                    =\r
 \r
+##################\r
+# Tiano Compress tool definitions\r
+##################\r
+*_*_*_TIANO_PATH              = TianoCompress\r
+*_*_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r