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
\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_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 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 EBC_BIN = C:\Program Files\Intel\EBC\Bin\r
+DEFINE EBC_BINx86 = C:\Program Files (x86)\Intel\EBC\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 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
-DEFINE UNIXGCC_X64_PETOOLS_PREFIX = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
-DEFINE UNIXGCC_IPF_PETOOLS_PREFIX = /opt/tiano/ia64-pc-elf/ia64-pc-elf/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_IPF_PETOOLS_PREFIX = /opt/tiano/ia64-pc-elf/ia64-pc-elf/bin/\r
#\r
# Option 2: Use an environment variable\r
#DEFINE UNIXGCC_IA32_PETOOLS_PREFIX = ENV(IA32_PETOOLS_PREFIX)\r
#\r
# Option 4: Create links under the BaseTools/Bin/gcc/ARCH directory\r
# 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
+#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
# 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
#\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 = /usr/bin/iasl\r
+#DEFINE UNIX_IASL_BIN = $(HOME)/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_OUTFLAGS = -p\r
+DEFINE MS_ASL_OUTFLAGS = /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
# 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
+# UNIXGCC - UNIX GCC, No EBC, Intel ASL\r
# ELFGCC - Linux ELF GCC, No EBC, Intel ASL\r
# CYGGCC - win32 - CygWin GCC, Intel EBC, Intel ASL\r
# ICC - win32 - Intel C Compiler V9.1, Intel EBC, Intel ASL\r
# 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
# *_*_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
##################\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 = \r
+*_VS2003_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\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
##################\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
##################\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 = \r
+*_VS2003xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)\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
##################\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
# 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 = \r
+*_VS2005_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\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
# ASL definitions\r
##################\r
*_VS2005xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)\r
-*_VS2005xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)\r
+*_VS2005xASL_*_ASL_FLAGS = \r
+*_VS2005xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)\r
*_VS2005xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)\r
*_VS2005xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)\r
*_VS2005xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_VS2005x86_*_ASL_PATH = DEF(WIN_IASL_BIN)\r
-*_VS2005x86_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_VS2005x86_*_ASL_FLAGS = \r
+*_VS2005x86_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_VS2005x86_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)\r
*_VS2005x86_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)\r
*_VS2005x86_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_VS2005x86xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)\r
-*_VS2005x86xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)\r
+*_VS2005x86xASL_*_ASL_FLAGS = \r
+*_VS2005x86xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)\r
*_VS2005x86xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)\r
*_VS2005x86xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)\r
*_VS2005x86xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_DDK3790_*_ASL_PATH = DEF(WIN_IASL_BIN)\r
-*_DDK3790_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_DDK3790_*_ASL_FLAGS = \r
+*_DDK3790_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_DDK3790_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)\r
*_DDK3790_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)\r
*_DDK3790_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_DDK3790xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)\r
-*_DDK3790xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)\r
+*_DDK3790xASL_*_ASL_FLAGS = \r
+*_DDK3790xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)\r
*_DDK3790xASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)\r
*_DDK3790xASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)\r
*_DDK3790xASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)\r
*_*_*_SYMRENAME_FLAGS = Symbol renaming not needed for\r
\r
DEFINE GCC_ALL_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -c -include AutoGen.h\r
-DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -D EFI32\r
+DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2\r
DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address\r
DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency\r
DEFINE GCC_IA32_X64_DLINK_COMMON = -nostdlib -s --pie --gc-sections\r
# ASL definitions\r
##################\r
*_UNIXGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)\r
-*_UNIXGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_UNIXGCC_*_ASL_FLAGS = \r
+*_UNIXGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_UNIXGCC_*_ASLPP_FLAGS = -x c -E -P\r
*_UNIXGCC_*_ASLCC_FLAGS = -x c\r
*_UNIXGCC_*_ASLDLINK_FLAGS = DEF(UNIXGCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
##################\r
# IA32 definitions\r
##################\r
-*_UNIXGCC_IA32_PP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\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_ASLPP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IA32_ASLCC_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\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_VFRPP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)/gcc\r
+*_UNIXGCC_IA32_PP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\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_ASLPP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IA32_ASLCC_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\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_VFRPP_PATH = DEF(UNIXGCC_IA32_PETOOLS_PREFIX)gcc\r
\r
-*_UNIXGCC_IA32_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -c -include AutoGen.h -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -D EFI32\r
+*_UNIXGCC_IA32_CC_FLAGS = -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -c -include AutoGen.h -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition \r
\r
##################\r
# X64 definitions\r
##################\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
+*_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-array-bounds -c -include AutoGen.h -mno-red-zone -Wno-address\r
+*_UNIXGCC_X64_CC_FLAGS = -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -c -include AutoGen.h -mno-red-zone -Wno-address\r
\r
##################\r
# IPF definitions\r
##################\r
-*_UNIXGCC_IPF_CC_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IPF_ASLCC_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IPF_SLINK_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/ar\r
-*_UNIXGCC_IPF_DLINK_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/ld\r
-*_UNIXGCC_IPF_ASLDLINK_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/ld\r
-*_UNIXGCC_IPF_ASM_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IPF_PP_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IPF_ASLPP_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IPF_VFRPP_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/gcc\r
-*_UNIXGCC_IPF_OBJCOPY_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/objcopy\r
-*_UNIXGCC_IPF_SYMRENAME_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)/objcopy\r
+*_UNIXGCC_IPF_CC_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IPF_ASLCC_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IPF_SLINK_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)ar\r
+*_UNIXGCC_IPF_DLINK_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)ld\r
+*_UNIXGCC_IPF_ASLDLINK_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)ld\r
+*_UNIXGCC_IPF_ASM_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IPF_PP_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IPF_ASLPP_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IPF_VFRPP_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)gcc\r
+*_UNIXGCC_IPF_OBJCOPY_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)objcopy\r
+*_UNIXGCC_IPF_SYMRENAME_PATH = DEF(UNIXGCC_IPF_PETOOLS_PREFIX)objcopy\r
\r
*_UNIXGCC_IPF_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -c -include AutoGen.h -minline-int-divide-min-latency\r
*_UNIXGCC_IPF_DLINK_FLAGS = -nostdlib -O2 --gc-sections --dll -static --entry $(IMAGE_ENTRY_POINT) --undefined $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
*_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
# ASL definitions\r
##################\r
*_CYGGCC_*_ASL_PATH = DEF(WIN_IASL_BIN)\r
+*_CYGGCC_*_ASL_FLAGS = \r
+*_CYGGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_CYGGCC_*_ASLPP_FLAGS = -x c -E -P\r
*_CYGGCC_*_ASLCC_FLAGS = -x c\r
-*_CYGGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
*_CYGGCC_*_ASLDLINK_FLAGS = -nostdlib -s --pie --gc-sections --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)\r
\r
##################\r
# IA32 definitions\r
##################\r
-*_CYGGCC_IA32_CC_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCC_IA32_SLINK_PATH = DEF(CYGWIN_BIN32)/ar\r
-*_CYGGCC_IA32_DLINK_PATH = DEF(CYGWIN_BIN32)/ld\r
-*_CYGGCC_IA32_ASM_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCC_IA32_PP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCC_IA32_APP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCC_IA32_VFRPP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCC_IA32_ASLCC_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCC_IA32_ASLPP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCC_IA32_ASLDLINK_PATH = DEF(CYGWIN_BIN32)/ld\r
+*_CYGGCC_IA32_CC_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCC_IA32_SLINK_PATH = DEF(CYGWIN_BIN32)ar\r
+*_CYGGCC_IA32_DLINK_PATH = DEF(CYGWIN_BIN32)ld\r
+*_CYGGCC_IA32_ASM_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCC_IA32_PP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCC_IA32_APP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCC_IA32_VFRPP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCC_IA32_ASLCC_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCC_IA32_ASLPP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCC_IA32_ASLDLINK_PATH = DEF(CYGWIN_BIN32)ld\r
\r
*_CYGGCC_IA32_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h\r
\r
##################\r
# X64 definitions\r
##################\r
-*_CYGGCC_X64_CC_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCC_X64_SLINK_PATH = DEF(CYGWIN_BINX64)/ar\r
-*_CYGGCC_X64_DLINK_PATH = DEF(CYGWIN_BINX64)/ld\r
-*_CYGGCC_X64_ASM_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCC_X64_PP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCC_X64_APP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCC_X64_VFRPP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCC_X64_ASLCC_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCC_X64_ASLPP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCC_X64_ASLDLINK_PATH = DEF(CYGWIN_BINX64)/ld\r
+*_CYGGCC_X64_CC_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCC_X64_SLINK_PATH = DEF(CYGWIN_BINX64)ar\r
+*_CYGGCC_X64_DLINK_PATH = DEF(CYGWIN_BINX64)ld\r
+*_CYGGCC_X64_ASM_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCC_X64_PP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCC_X64_APP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCC_X64_VFRPP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCC_X64_ASLCC_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCC_X64_ASLPP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCC_X64_ASLDLINK_PATH = DEF(CYGWIN_BINX64)ld\r
\r
*_CYGGCC_X64_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -mno-red-zone -Wall -Werror -c -include AutoGen.h -D_EFI_P64\r
\r
*_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
# ASL definitions\r
##################\r
*_CYGGCCxASL_*_ASL_PATH = DEF(WIN_ASL_BIN)\r
-*_CYGGCCxASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)\r
+*_CYGGCCxASL_*_ASL_FLAGS = \r
+*_CYGGCCxASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)\r
*_CYGGCCxASL_*_ASLCC_FLAGS = DEF(MSFT_ASLCC_FLAGS)\r
*_CYGGCCxASL_*_ASLPP_FLAGS = DEF(MSFT_ASLPP_FLAGS)\r
*_CYGGCCxASL_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS)\r
##################\r
# IA32 definitions\r
##################\r
-*_CYGGCCxASL_IA32_CC_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCCxASL_IA32_SLINK_PATH = DEF(CYGWIN_BIN32)/ar\r
-*_CYGGCCxASL_IA32_DLINK_PATH = DEF(CYGWIN_BIN32)/ld\r
-*_CYGGCCxASL_IA32_ASM_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCCxASL_IA32_PP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCCxASL_IA32_APP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCCxASL_IA32_VFRPP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCCxASL_IA32_ASLCC_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCCxASL_IA32_ASLPP_PATH = DEF(CYGWIN_BIN32)/gcc\r
-*_CYGGCCxASL_IA32_ASLDLINK_PATH = DEF(CYGWIN_BIN32)/ld\r
+*_CYGGCCxASL_IA32_CC_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCCxASL_IA32_SLINK_PATH = DEF(CYGWIN_BIN32)ar\r
+*_CYGGCCxASL_IA32_DLINK_PATH = DEF(CYGWIN_BIN32)ld\r
+*_CYGGCCxASL_IA32_ASM_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCCxASL_IA32_PP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCCxASL_IA32_APP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCCxASL_IA32_VFRPP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCCxASL_IA32_ASLCC_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCCxASL_IA32_ASLPP_PATH = DEF(CYGWIN_BIN32)gcc\r
+*_CYGGCCxASL_IA32_ASLDLINK_PATH = DEF(CYGWIN_BIN32)ld\r
\r
*_CYGGCCxASL_IA32_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h\r
\r
##################\r
# X64 definitions\r
##################\r
-*_CYGGCCxASL_X64_CC_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCCxASL_X64_SLINK_PATH = DEF(CYGWIN_BINX64)/ar\r
-*_CYGGCCxASL_X64_DLINK_PATH = DEF(CYGWIN_BINX64)/ld\r
-*_CYGGCCxASL_X64_ASM_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCCxASL_X64_PP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCCxASL_X64_APP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCCxASL_X64_VFRPP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCCxASL_X64_ASLCC_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCCxASL_X64_ASLPP_PATH = DEF(CYGWIN_BINX64)/gcc\r
-*_CYGGCCxASL_X64_ASLDLINK_PATH = DEF(CYGWIN_BINX64)/ld\r
+*_CYGGCCxASL_X64_CC_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCCxASL_X64_SLINK_PATH = DEF(CYGWIN_BINX64)ar\r
+*_CYGGCCxASL_X64_DLINK_PATH = DEF(CYGWIN_BINX64)ld\r
+*_CYGGCCxASL_X64_ASM_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCCxASL_X64_PP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCCxASL_X64_APP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCCxASL_X64_VFRPP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCCxASL_X64_ASLCC_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCCxASL_X64_ASLPP_PATH = DEF(CYGWIN_BINX64)gcc\r
+*_CYGGCCxASL_X64_ASLDLINK_PATH = DEF(CYGWIN_BINX64)ld\r
\r
*_CYGGCCxASL_X64_CC_FLAGS = -Os -fshort-wchar -fno-strict-aliasing -mno-red-zone -Wall -Werror -c -include AutoGen.h -D_EFI_P64\r
\r
# ASL definitions\r
##################\r
*_ELFGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)\r
-*_ELFGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_ELFGCC_*_ASL_FLAGS = \r
+*_ELFGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_ELFGCC_*_ASLPP_FLAGS = -x c -E -P\r
*_ELFGCC_*_ASLCC_FLAGS = -x c\r
*_ELFGCC_*_ASLDLINK_FLAGS = DEF(UNIXGCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
# ASL definitions\r
##################\r
*_ICC_*_ASL_PATH = DEF(WIN_IASL_BIN)\r
-*_ICC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_ICC_*_ASL_FLAGS = \r
+*_ICC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_ICC_*_ASLCC_FLAGS = DEF(ICC_WIN_ASLCC_FLAGS)\r
*_ICC_*_ASLPP_FLAGS = DEF(ICC_WIN_ASLPP_FLAGS)\r
*_ICC_*_ASLDLINK_FLAGS = DEF(ICC_WIN_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_ICCxASL_*_ASL_PATH = DEF(WIN_IASL_BIN)\r
-*_ICCxASL_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_ICCxASL_*_ASL_FLAGS =\r
+*_ICCxASL_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_ICCxASL_*_ASLCC_FLAGS = DEF(ICC_WIN_ASLCC_FLAGS)\r
*_ICCxASL_*_ASLPP_FLAGS = DEF(ICC_WIN_ASLPP_FLAGS)\r
*_ICCxASL_*_ASLDLINK_FLAGS = DEF(ICC_WIN_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_ICCx86_*_ASL_PATH = DEF(WIN_IASL_BIN)\r
-*_ICCx86_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_ICCx86_*_ASL_FLAGS =\r
+*_ICCx86_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_ICCx86_*_ASLCC_FLAGS = DEF(ICC_WIN_ASLCC_FLAGS)\r
*_ICCx86_*_ASLPP_FLAGS = DEF(ICC_WIN_ASLPP_FLAGS)\r
*_ICCx86_*_ASLDLINK_FLAGS = DEF(ICC_WIN_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_ICCx86xASL_*_ASL_PATH = DEF(WIN_ASL_BIN)\r
-*_ICCx86xASL_*_ASL_FLAGS = DEF(MS_ASL_FLAGS)\r
+*_ICCx86xASL_*_ASL_FLAGS =\r
+*_ICCx86xASL_*_ASL_OUTFLAGS = DEF(MS_ASL_OUTFLAGS)\r
*_ICCx86xASL_*_ASLCC_FLAGS = DEF(ICC_WIN_ASLCC_FLAGS)\r
*_ICCx86xASL_*_ASLPP_FLAGS = DEF(ICC_WIN_ASLPP_FLAGS)\r
*_ICCx86xASL_*_ASLDLINK_FLAGS = DEF(ICC_WIN_ASLDLINK_FLAGS)\r
# ASL definitions\r
##################\r
*_MYTOOLS_*_ASL_PATH = DEF(WIN_IASL_BIN)\r
-*_MYTOOLS_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
+*_MYTOOLS_*_ASL_FLAGS =\r
+*_MYTOOLS_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
*_MYTOOLS_*_ASLCC_FLAGS = DEF(ICC_WIN_ASLCC_FLAGS)\r
*_MYTOOLS_*_ASLPP_FLAGS = DEF(ICC_WIN_ASLPP_FLAGS)\r
*_MYTOOLS_*_ASLDLINK_FLAGS = DEF(ICC_WIN_ASLDLINK_FLAGS)\r
*_*_*_VFR_PATH = VfrCompile\r
*_*_*_VFR_FLAGS = -l -n\r
\r
+##################\r
+# OptionRom tool definitions\r
+##################\r
+*_*_*_OPTROM_PATH = EfiRom\r
+*_*_*_OPTROM_FLAGS = -e\r
+\r
##################\r
# Asl Compiler definitions\r
##################\r
*_*_*_ASL_FLAGS =\r
\r
##################\r
-# Tiano Compress tool definitions\r
-##################\r
-*_*_*_TIANO_PATH = TianoCompress\r
-*_*_*_TIANO_GUID = A31280AD-481E-41B6-95E8-127F4C984779\r
-\r
-##################\r
-# Lzma compress tool definitions\r
+# LzmaCompress 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
+*_*_*_LZMA_PATH = LzmaCompress\r
+*_*_*_LZMA_GUID = EE4E5898-3914-4259-9D6E-DC7BD79403CF\r
\r
##################\r
-# ASL tool definitions\r
+# TianoCompress tool definitions\r
##################\r
-DEFINE ASL_BIN = ENV(WORKSPACE)\IntelRestrictedTools\Bin\Win32\r
-*_*_*_ASL_PATH = DEF(ASL_BIN)\iasl.exe\r
+*_*_*_TIANO_PATH = TianoCompress\r
+*_*_*_TIANO_GUID = A31280AD-481E-41B6-95E8-127F4C984779\r
\r