update

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 064402c82d7ea2ee871f958437e072f437796275..3e3e379d26ed2906e83a5c2d00d8223af25e5def 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -303,8 +303,8 @@
         GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
     <Command.GCC>\r
-        "$(ASLCC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
-        "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+        "$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
+        "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
 [Acpi-Table-Code-File]\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 9d4c2c621ef7aa25470dede1f44e2c156b0e45bf..17cbb630cf3403a596d8500dd1a46b40c333a2ce 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -13,52 +13,47 @@
 IDENTIFIER = Default TOOL_CHAIN_CONF\r
 \r
 # common path macros\r
-DEFINE VSNET_BIN = C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\r
-DEFINE VSNET_DLL = C:\Program Files\Microsoft Visual Studio .NET\Common7\IDE\r
+DEFINE VS2003_BIN       = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+DEFINE VS2003_DLL       = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
 \r
-DEFINE VSNET2003_BIN = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-DEFINE VSNET2003_DLL = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
-\r
-DEFINE VS2005_BIN = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-DEFINE VS2005_DLL = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
-DEFINE VS2005_BINX64 = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
-DEFINE VS2005_BIN64  = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_ia64\r
+DEFINE VS2005_BIN       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
+DEFINE VS2005_DLL       = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\r
+DEFINE VS2005_BINX64    = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
+DEFINE VS2005_BIN64     = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_ia64\r
 \r
 DEFINE VS2005x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 8\Vc\bin\r
 DEFINE VS2005x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 8\Common7\IDE\r
 DEFINE VS2005x86_BINX64 = DEF(VS2005x86_BIN)\x86_amd64\r
 DEFINE VS2005x86_BIN64  = DEF(VS2005x86_BIN)\x86_ia64\r
 \r
-DEFINE WINDDK_BIN16   = C:\WINDDK\3790.1830\bin\bin16\r
-DEFINE WINDDK_BIN32   = C:\WINDDK\3790.1830\bin\x86\r
-DEFINE WINDDK_BINX64  = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
-DEFINE WINDDK_BIN64   = C:\WINDDK\3790.1830\bin\win64\x86\r
+DEFINE WINDDK_BIN16     = C:\WINDDK\3790.1830\bin\bin16\r
+DEFINE WINDDK_BIN32     = C:\WINDDK\3790.1830\bin\x86\r
+DEFINE WINDDK_BINX64    = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
+DEFINE WINDDK_BIN64     = C:\WINDDK\3790.1830\bin\win64\x86\r
 \r
 # NOTE: The Intel C++ Compiler for Windows requires one of the Microsoft C compiler \r
 #        tool chains for the linker and nmake commands.\r
 #        This configuration assumes a Windows 2003 Server DDK installation.\r
-DEFINE ICC_VERSION     = 9.1\r
+DEFINE ICC_VERSION      = 9.1\r
 #DEFINE ICC_VERSION     = 10.1.021\r
-DEFINE ICC_BIN32       = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
-DEFINE ICC_ASM32       = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
-DEFINE ICC_BIN32x86    = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
-DEFINE ICC_ASM32x86    = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
+DEFINE ICC_BIN32        = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
+DEFINE ICC_ASM32        = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
+DEFINE ICC_BIN32x86     = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
+DEFINE ICC_ASM32x86     = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\IA32\Bin\r
 \r
-DEFINE ICC_BINX64      = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
-DEFINE ICC_ASMX64      = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
-DEFINE ICC_BINX64x86   = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
-DEFINE ICC_ASMX64x86   = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
+DEFINE ICC_BINX64       = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
+DEFINE ICC_ASMX64       = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
+DEFINE ICC_BINX64x86    = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
+DEFINE ICC_ASMX64x86    = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\EM64T\Bin\r
 \r
-DEFINE ICC_BIN64       = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin\r
-DEFINE ICC_BIN64x86    = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin\r
+DEFINE ICC_BIN64        = C:\Program Files\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin\r
+DEFINE ICC_BIN64x86     = C:\Program Files (x86)\Intel\Compiler\C++\DEF(ICC_VERSION)\Itanium\Bin\r
 \r
-DEFINE EBC_BIN         = C:\Program Files\Intel\EBC\Bin\r
-DEFINE EBC_BINx86      = C:\Program Files (x86)\Intel\EBC\Bin\r
+DEFINE EBC_BIN          = C:\Program Files\Intel\EBC\Bin\r
+DEFINE EBC_BINx86       = C:\Program Files (x86)\Intel\EBC\Bin\r
+\r
+DEFINE ELFGCC_BIN       = /usr/bin\r
 \r
-DEFINE ELFGCC_BIN              = /usr/bin\r
-DEFINE UNIX_IASL_BIN           = ~/programs/iasl\r
-DEFINE IASL_FLAGS              = -p\r
-DEFINE MS_ASL_FLAGS            = /Fo=\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
@@ -83,14 +78,19 @@ DEFINE UNIXGCC_IPF_PETOOLS_PREFIX  = /opt/tiano/ia64-pc-elf/ia64-pc-elf/bin
 #DEFINE UNIXGCC_X64_PETOOLS_PREFIX  = ENV(HOME)/programs/gcc/x64/bin/x86_64-pc-mingw32-\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
-DEFINE CYGWIN_BINIPF  = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-\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
+DEFINE CYGWIN_BINIPF           = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-\r
+\r
+DEFINE UNIX_IASL_BIN           = ~/programs/iasl\r
+DEFINE WIN_ASL_BIN_DIR         = C:\ASL\r
+DEFINE WIN_IASL_BIN            = DEF(WIN_ASL_BIN_DIR)\iasl.exe\r
+DEFINE WIN_ASL_BIN             = DEF(WIN_ASL_BIN_DIR)\asl.exe\r
+\r
+DEFINE IASL_FLAGS              = -p\r
+DEFINE MS_ASL_FLAGS            = /Fo=\r
 \r
-DEFINE WIN_ASL_BIN_DIR = C:\ASL\r
-DEFINE WIN_IASL_BIN    = DEF(WIN_ASL_BIN_DIR)\iasl.exe\r
-DEFINE WIN_ASL_BIN     = DEF(WIN_ASL_BIN_DIR)\asl.exe\r
 DEFINE MSFT_ASLPP_FLAGS        = /nologo /EP /C\r
 DEFINE MSFT_ASLCC_FLAGS        = /GL- /Y- /TC /Dmain=ReferenceAcpiTable\r
 DEFINE MSFT_ASLDLINK_FLAGS     = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE\r
@@ -127,10 +127,6 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS
 # Supported Tool Chains\r
 # =====================\r
 #   VS2003                 - win32 - Microsoft Visual Studio .NET 2003, Intel EBC, Intel ASL\r
-#   VS2005EXP*             - Microsoft Visual Studio 2005 Express Edition\r
-#   VS2005STD*             - Microsoft Visual Studio 2005 Standard Edition\r
-#   VS2005PRO              - Microsoft Visual Studio 2005 Professional Edition\r
-#   VS2005TEAMSUITE*       - Microsoft Visual Studio 2005 Team Suite Edition\r
 #   VS2005                 - win32 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Intel ASL (also compatible with VS 2005 Express, Standard, and Pro)\r
 #   DDK3790                - win32 - Microsoft Windows DDK 3790.1830, Intel EBC, Intel ASL\r
 #   UINIXGCC               - UNIX GCC, No EBC, Intel ASL\r
@@ -143,10 +139,12 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS
 #   DDK3790xASL            - win32 - Microsoft Windows DDK 3790.1830, Intel EBC, Microsoft ASL\r
 #   CYGGCCxASL             - win32 - CygWin GCC, Intel EBC, Microsoft ASL\r
 #   ICCxASL                - win32 - Intel C Compiler V9.1, Intel EBC, Microsoft ASL\r
-#   VS2005x86              - win64 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Intel ASL (also compatible with VS 2005 Express, Standard, and Pro)\r
-#   ICCx86                 - win64 - Intel C Compiler V9.1, Intel EBC, Intel ASL\r
-#   VS2005x86xASL          - win64 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Microsoft ASL\r
-#   ICCx86xASL             - win64 - Intel C Compiler V9.1, Intel EBC, Microsoft ASL\r
+#   VS2005x86              - win64 - Microsoft Visual Studio 2005 Team Suite Edition (x86), Intel EBC, Intel ASL (also compatible with VS 2005 Express, Standard, and Pro)\r
+#   ICCx86                 - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Intel ASL\r
+#   VS2005x86xASL          - win64 - Microsoft Visual Studio 2005 Team Suite Edition (x86), Intel EBC, Microsoft ASL (also compatible with VS 2005 Express, Standard, and Pro)\r
+#   ICCx86xASL             - win64 - Intel C Compiler V9.1 (x86), Intel EBC, Microsoft ASL\r
+#   CYGGCCx86              - win64 - CygWin GCC (x86), Intel EBC (x86), Intel ASL\r
+#   CYGGCCx86xASL          - win64 - CygWin GCC (x86), Intel EBC (x86), Microsoft ASL\r
 # * Commented out - All versions of VS2005 use the same standard install directory\r
 #\r
 ####################################################################################\r
@@ -169,10 +167,10 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS
 # *_*_EBC_CC_PATH                    = C:\Program Files\Intel\EBC\Bin\iec.exe\r
 # *_*_EBC_SLINK_PATH                 = C:\Program Files\Intel\EBC\Bin\link.exe\r
 #\r
-# *_*_EBC_SLINK_FLAGS                     = /lib /NOLOGO /MACHINE:EBC\r
-# *_*_EBC_PP_FLAGS                        = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-# *_*_EBC_CC_FLAGS                        = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-# *_*_EBC_DLINK_FLAGS                     = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+# *_*_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
+# *_*_EBC_PP_FLAGS                   = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+# *_*_EBC_CC_FLAGS                   = /nologo /FAcs /c /W3 /WX /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+# *_*_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
 #\r
 ####################################################################################\r
 #\r
@@ -207,29 +205,29 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2003_*_ASL_PATH           = DEF(WIN_IASL_BIN)\r
-*_VS2003_*_ASL_FLAGS          = DEF(IASL_FLAGS)\r
-*_VS2003_*_ASLCC_FLAGS        = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2003_*_ASLPP_FLAGS        = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2003_*_ASLDLINK_FLAGS     = DEF(MSFT_ASLDLINK_FLAGS)\r
+*_VS2003_*_ASL_PATH                 = DEF(WIN_IASL_BIN)\r
+*_VS2003_*_ASL_FLAGS                = DEF(IASL_FLAGS)\r
+*_VS2003_*_ASLCC_FLAGS              = DEF(MSFT_ASLCC_FLAGS)\r
+*_VS2003_*_ASLPP_FLAGS              = DEF(MSFT_ASLPP_FLAGS)\r
+*_VS2003_*_ASLDLINK_FLAGS           = DEF(MSFT_ASLDLINK_FLAGS)\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_VS2003_IA32_*_DLL                 = DEF(VSNET2003_DLL)\r
+*_VS2003_IA32_*_DLL                 = DEF(VS2003_DLL)\r
 \r
-*_VS2003_IA32_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
-*_VS2003_IA32_CC_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003_IA32_VFRPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003_IA32_SLINK_PATH            = DEF(VSNET2003_BIN)\lib.exe\r
-*_VS2003_IA32_DLINK_PATH            = DEF(VSNET2003_BIN)\link.exe\r
+*_VS2003_IA32_MAKE_PATH             = DEF(VS2003_BIN)\nmake.exe\r
+*_VS2003_IA32_CC_PATH               = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003_IA32_VFRPP_PATH            = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003_IA32_SLINK_PATH            = DEF(VS2003_BIN)\lib.exe\r
+*_VS2003_IA32_DLINK_PATH            = DEF(VS2003_BIN)\link.exe\r
 *_VS2003_IA32_ASMLINK_PATH          = DEF(WINDDK_BIN16)\link16.exe\r
-*_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_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
+*_VS2003_IA32_APP_PATH              = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003_IA32_PP_PATH               = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003_IA32_ASM_PATH              = DEF(VS2003_BIN)\ml.exe\r
+*_VS2003_IA32_ASLCC_PATH            = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003_IA32_ASLPP_PATH            = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003_IA32_ASLDLINK_PATH         = DEF(VS2003_BIN)\link.exe\r
 \r
 \r
       *_VS2003_IA32_MAKE_FLAGS      = /nologo\r
@@ -250,7 +248,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:RE
 ##################\r
 *_VS2003_EBC_*_FAMILY               = INTEL\r
 \r
-*_VS2003_EBC_MAKE_PATH              = DEF(VSNET2003_BIN)\nmake.exe\r
+*_VS2003_EBC_MAKE_PATH              = DEF(VS2003_BIN)\nmake.exe\r
 *_VS2003_EBC_PP_PATH                = DEF(EBC_BIN)\iec.exe\r
 *_VS2003_EBC_VFRPP_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2003_EBC_CC_PATH                = DEF(EBC_BIN)\iec.exe\r
@@ -275,29 +273,29 @@ RELEASE_VS2003_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:RE
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2003xASL_*_ASL_PATH           = DEF(WIN_ASL_BIN)\r
-*_VS2003xASL_*_ASL_FLAGS          = DEF(MS_ASL_FLAGS)\r
-*_VS2003xASL_*_ASLCC_FLAGS        = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2003xASL_*_ASLPP_FLAGS        = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2003xASL_*_ASLDLINK_FLAGS     = DEF(MSFT_ASLDLINK_FLAGS)\r
+*_VS2003xASL_*_ASL_PATH                 = DEF(WIN_ASL_BIN)\r
+*_VS2003xASL_*_ASL_FLAGS                = DEF(MS_ASL_FLAGS)\r
+*_VS2003xASL_*_ASLCC_FLAGS              = DEF(MSFT_ASLCC_FLAGS)\r
+*_VS2003xASL_*_ASLPP_FLAGS              = DEF(MSFT_ASLPP_FLAGS)\r
+*_VS2003xASL_*_ASLDLINK_FLAGS           = DEF(MSFT_ASLDLINK_FLAGS)\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_VS2003xASL_IA32_*_DLL                 = DEF(VSNET2003_DLL)\r
+*_VS2003xASL_IA32_*_DLL                 = DEF(VS2003_DLL)\r
 \r
-*_VS2003xASL_IA32_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
-*_VS2003xASL_IA32_CC_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003xASL_IA32_VFRPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003xASL_IA32_SLINK_PATH            = DEF(VSNET2003_BIN)\lib.exe\r
-*_VS2003xASL_IA32_DLINK_PATH            = DEF(VSNET2003_BIN)\link.exe\r
+*_VS2003xASL_IA32_MAKE_PATH             = DEF(VS2003_BIN)\nmake.exe\r
+*_VS2003xASL_IA32_CC_PATH               = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003xASL_IA32_VFRPP_PATH            = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003xASL_IA32_SLINK_PATH            = DEF(VS2003_BIN)\lib.exe\r
+*_VS2003xASL_IA32_DLINK_PATH            = DEF(VS2003_BIN)\link.exe\r
 *_VS2003xASL_IA32_ASMLINK_PATH          = DEF(WINDDK_BIN16)\link16.exe\r
-*_VS2003xASL_IA32_APP_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003xASL_IA32_PP_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003xASL_IA32_ASM_PATH              = DEF(VSNET2003_BIN)\ml.exe\r
-*_VS2003xASL_IA32_ASLCC_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003xASL_IA32_ASLPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
-*_VS2003xASL_IA32_ASLDLINK_PATH         = DEF(VSNET2003_BIN)\link.exe\r
+*_VS2003xASL_IA32_APP_PATH              = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003xASL_IA32_PP_PATH               = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003xASL_IA32_ASM_PATH              = DEF(VS2003_BIN)\ml.exe\r
+*_VS2003xASL_IA32_ASLCC_PATH            = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003xASL_IA32_ASLPP_PATH            = DEF(VS2003_BIN)\cl.exe\r
+*_VS2003xASL_IA32_ASLDLINK_PATH         = DEF(VS2003_BIN)\link.exe\r
 \r
 \r
       *_VS2003xASL_IA32_MAKE_FLAGS      = /nologo\r
@@ -318,7 +316,7 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 ##################\r
 *_VS2003xASL_EBC_*_FAMILY               = INTEL\r
 \r
-*_VS2003xASL_EBC_MAKE_PATH              = DEF(VSNET2003_BIN)\nmake.exe\r
+*_VS2003xASL_EBC_MAKE_PATH              = DEF(VS2003_BIN)\nmake.exe\r
 *_VS2003xASL_EBC_PP_PATH                = DEF(EBC_BIN)\iec.exe\r
 *_VS2003xASL_EBC_VFRPP_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2003xASL_EBC_CC_PATH                = DEF(EBC_BIN)\iec.exe\r
@@ -340,51 +338,51 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 #   ASL     - Intel ACPI Source Language Compiler\r
 ####################################################################################\r
 #   VS2005           - Microsoft Visual Studio 2005 ALL Edition, including Standard, Professional, Express, TeamSuite\r
-*_VS2005_*_*_FAMILY        = MSFT\r
+*_VS2005_*_*_FAMILY               = MSFT\r
 \r
-*_VS2005_*_MAKE_PATH       = DEF(VS2005_BIN)\nmake.exe\r
-*_VS2005_*_MAKE_FLAGS      = /nologo\r
+*_VS2005_*_MAKE_PATH              = DEF(VS2005_BIN)\nmake.exe\r
+*_VS2005_*_MAKE_FLAGS             = /nologo\r
 \r
-*_VS2005_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
-*_VS2005_*_APP_FLAGS       = /nologo /E /TC\r
-*_VS2005_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
-*_VS2005_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
+*_VS2005_*_SLINK_FLAGS            = /NOLOGO /LTCG\r
+*_VS2005_*_APP_FLAGS              = /nologo /E /TC\r
+*_VS2005_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h\r
+*_VS2005_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 \r
 ##################\r
 # ASL definitions\r
 ##################\r
-*_VS2005_*_ASL_PATH        = DEF(WIN_IASL_BIN)\r
-*_VS2005_*_ASL_FLAGS       = DEF(IASL_FLAGS)\r
-*_VS2005_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_VS2005_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_VS2005_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
+*_VS2005_*_ASL_PATH               = DEF(WIN_IASL_BIN)\r
+*_VS2005_*_ASL_FLAGS              = DEF(IASL_FLAGS)\r
+*_VS2005_*_ASLCC_FLAGS            = DEF(MSFT_ASLCC_FLAGS)\r
+*_VS2005_*_ASLPP_FLAGS            = DEF(MSFT_ASLPP_FLAGS)\r
+*_VS2005_*_ASLDLINK_FLAGS         = DEF(MSFT_ASLDLINK_FLAGS)\r
 \r
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_VS2005_IA32_*_DLL        = DEF(VS2005_DLL)\r
-\r
-*_VS2005_IA32_MAKE_PATH    = DEF(VS2005_BIN)\nmake.exe\r
-*_VS2005_IA32_CC_PATH      = DEF(VS2005_BIN)\cl.exe\r
-*_VS2005_IA32_VFRPP_PATH   = DEF(VS2005_BIN)\cl.exe\r
-*_VS2005_IA32_SLINK_PATH   = DEF(VS2005_BIN)\lib.exe\r
-*_VS2005_IA32_DLINK_PATH   = DEF(VS2005_BIN)\link.exe\r
-*_VS2005_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe\r
-*_VS2005_IA32_APP_PATH     = DEF(VS2005_BIN)\cl.exe\r
-*_VS2005_IA32_PP_PATH      = DEF(VS2005_BIN)\cl.exe\r
-*_VS2005_IA32_ASM_PATH     = DEF(VS2005_BIN)\ml.exe\r
-*_VS2005_IA32_ASLCC_PATH    = DEF(VS2005_BIN)\cl.exe\r
-*_VS2005_IA32_ASLPP_PATH    = DEF(VS2005_BIN)\cl.exe\r
-*_VS2005_IA32_ASLDLINK_PATH = DEF(VS2005_BIN)\link.exe\r
-\r
-      *_VS2005_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2005_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-RELEASE_VS2005_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_VS2005_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
-RELEASE_VS2005_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-  DEBUG_VS2005_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
-RELEASE_VS2005_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 /MERGE:.data=.text /MERGE:.rdata=.text\r
-      *_VS2005_IA32_ASMLINK_FLAGS= /nologo /tiny\r
+*_VS2005_IA32_*_DLL               = DEF(VS2005_DLL)\r
+\r
+*_VS2005_IA32_MAKE_PATH           = DEF(VS2005_BIN)\nmake.exe\r
+*_VS2005_IA32_CC_PATH             = DEF(VS2005_BIN)\cl.exe\r
+*_VS2005_IA32_VFRPP_PATH          = DEF(VS2005_BIN)\cl.exe\r
+*_VS2005_IA32_SLINK_PATH          = DEF(VS2005_BIN)\lib.exe\r
+*_VS2005_IA32_DLINK_PATH          = DEF(VS2005_BIN)\link.exe\r
+*_VS2005_IA32_ASMLINK_PATH        = DEF(WINDDK_BIN16)\link16.exe\r
+*_VS2005_IA32_APP_PATH            = DEF(VS2005_BIN)\cl.exe\r
+*_VS2005_IA32_PP_PATH             = DEF(VS2005_BIN)\cl.exe\r
+*_VS2005_IA32_ASM_PATH            = DEF(VS2005_BIN)\ml.exe\r
+*_VS2005_IA32_ASLCC_PATH          = DEF(VS2005_BIN)\cl.exe\r
+*_VS2005_IA32_ASLPP_PATH          = DEF(VS2005_BIN)\cl.exe\r
+*_VS2005_IA32_ASLDLINK_PATH       = DEF(VS2005_BIN)\link.exe\r
+\r
+      *_VS2005_IA32_MAKE_FLAGS    = /nologo\r
+  DEBUG_VS2005_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
+RELEASE_VS2005_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+  DEBUG_VS2005_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
+RELEASE_VS2005_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd\r
+  DEBUG_VS2005_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
+RELEASE_VS2005_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 /MERGE:.data=.text /MERGE:.rdata=.text\r
+      *_VS2005_IA32_ASMLINK_FLAGS = /nologo /tiny\r
 \r
 ##################\r
 # X64 definitions\r
@@ -1137,7 +1135,7 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 *_CYGGCC_*_*_FAMILY              = GCC\r
 \r
 *_CYGGCC_*_*_DLL                 = DEF(CYGWIN_BIN)\r
-*_CYGGCC_*_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
+*_CYGGCC_*_MAKE_PATH             = DEF(VS2003_BIN)\nmake.exe\r
 \r
 *_CYGGCC_*_MAKE_FLAGS                 = /nologo\r
 *_CYGGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
@@ -1232,7 +1230,7 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 *_CYGGCCxASL_*_*_FAMILY              = GCC\r
 \r
 *_CYGGCCxASL_*_*_DLL                 = DEF(CYGWIN_BIN)\r
-*_CYGGCCxASL_*_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
+*_CYGGCCxASL_*_MAKE_PATH             = DEF(VS2003_BIN)\nmake.exe\r
 \r
 *_CYGGCCxASL_*_MAKE_FLAGS                 = /nologo\r
 *_CYGGCCxASL_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
@@ -2044,16 +2042,3 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_*_*_TIANO_PATH              = TianoCompress\r
 *_*_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
 \r
-##################\r
-# Lzma compress tool definitions\r
-##################\r
-DEFINE LZMA_BIN  = ENV(WORKSPACE)\IntelRestrictedTools\Bin\Win32\r
-*_*_*_LZMA_PATH               = DEF(LZMA_BIN)\LzmaCompress.exe\r
-*_*_*_LZMA_GUID                    = EE4E5898-3914-4259-9D6E-DC7BD79403CF\r
-\r
-##################\r
-# ASL tool definitions\r
-##################\r
-DEFINE ASL_BIN   = ENV(WORKSPACE)\IntelRestrictedTools\Bin\Win32\r
-*_*_*_ASL_PATH                      = DEF(ASL_BIN)\iasl.exe\r
-\r