Change the default location for IASL on Unix.

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index b162c5490b92d8b1529c8aa6a57769c6746ea375..ba2a512250216cd84380d0bdebd6ce39ae433ad9 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -56,9 +56,9 @@ DEFINE ELFGCC_BIN       = /usr/bin
 \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
@@ -70,8 +70,8 @@ DEFINE UNIXGCC_IPF_PETOOLS_PREFIX  = /opt/tiano/ia64-pc-elf/ia64-pc-elf/bin
 #\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
@@ -79,17 +79,18 @@ DEFINE UNIXGCC_IPF_PETOOLS_PREFIX  = /opt/tiano/ia64-pc-elf/ia64-pc-elf/bin
 #\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_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 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_FLAGS              = -p\r
-DEFINE MS_ASL_FLAGS            = /Fo=\r
+DEFINE IASL_OUTFLAGS           = -p\r
+DEFINE MS_ASL_OUTFLAGS         = /Fo=\r
 \r
 DEFINE MSFT_ASLPP_FLAGS        = /nologo /EP /C\r
 DEFINE MSFT_ASLCC_FLAGS        = /GL- /Y- /TC /Dmain=ReferenceAcpiTable\r
@@ -129,7 +130,7 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS
 #   VS2003                 - win32 - Microsoft Visual Studio .NET 2003, Intel EBC, Intel ASL\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
@@ -206,7 +207,8 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS
 # ASL definitions\r
 ##################\r
 *_VS2003_*_ASL_PATH                 = DEF(WIN_IASL_BIN)\r
-*_VS2003_*_ASL_FLAGS                = DEF(IASL_FLAGS)\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
@@ -274,7 +276,8 @@ RELEASE_VS2003_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:RE
 # ASL definitions\r
 ##################\r
 *_VS2003xASL_*_ASL_PATH                 = DEF(WIN_ASL_BIN)\r
-*_VS2003xASL_*_ASL_FLAGS                = DEF(MS_ASL_FLAGS)\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
@@ -352,7 +355,8 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 # ASL definitions\r
 ##################\r
 *_VS2005_*_ASL_PATH               = DEF(WIN_IASL_BIN)\r
-*_VS2005_*_ASL_FLAGS              = DEF(IASL_FLAGS)\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
@@ -472,7 +476,8 @@ RELEASE_VS2005_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF
 # 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
@@ -592,7 +597,8 @@ RELEASE_VS2005xASL_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.
 # 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
@@ -712,7 +718,8 @@ RELEASE_VS2005x86_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.I
 # 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
@@ -832,7 +839,8 @@ RELEASE_VS2005x86xASL_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT: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
@@ -940,7 +948,8 @@ RELEASE_DDK3790_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF
 # 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
@@ -1070,7 +1079,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # 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
@@ -1078,47 +1088,47 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 ##################\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\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
@@ -1148,40 +1158,41 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # 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
@@ -1243,7 +1254,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # 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
@@ -1251,32 +1263,32 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 ##################\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
@@ -1332,7 +1344,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # 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
@@ -1420,7 +1433,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # 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
@@ -1545,7 +1559,8 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 # 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
@@ -1671,7 +1686,8 @@ RELEASE_ICCxASL_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL
 # 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
@@ -1797,7 +1813,8 @@ RELEASE_ICCx86_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /
 # 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
@@ -1917,7 +1934,8 @@ RELEASE_ICCx86xASL_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /D
 # 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
@@ -2028,6 +2046,12 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_*_*_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
@@ -2037,8 +2061,14 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_*_*_ASL_FLAGS                    =\r
 \r
 ##################\r
-# Tiano Compress tool definitions\r
+# LzmaCompress tool definitions\r
+##################\r
+*_*_*_LZMA_PATH          = LzmaCompress\r
+*_*_*_LZMA_GUID          = EE4E5898-3914-4259-9D6E-DC7BD79403CF\r
+\r
+##################\r
+# TianoCompress tool definitions\r
 ##################\r
-*_*_*_TIANO_PATH              = TianoCompress\r
-*_*_*_TIANO_GUID                   = A31280AD-481E-41B6-95E8-127F4C984779\r
+*_*_*_TIANO_PATH         = TianoCompress\r
+*_*_*_TIANO_GUID         = A31280AD-481E-41B6-95E8-127F4C984779\r
 \r