]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Conf/tools_def.template
Change the GUID value of FVB to be that of FVB2 in PI 1.2 spec. this will force FVB...
[mirror_edk2.git] / BaseTools / Conf / tools_def.template
index b162c5490b92d8b1529c8aa6a57769c6746ea375..b3132a08fe501baafb04649465b55f42ccd26762 100644 (file)
@@ -1,5 +1,6 @@
 #\r
 #  Copyright (c) 2006-2009, Intel Corporation\r
+#  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.\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
@@ -56,9 +57,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 +71,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 +80,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
@@ -99,6 +101,12 @@ DEFINE ICC_WIN_ASLPP_FLAGS     = /nologo /EP /C
 DEFINE ICC_WIN_ASLCC_FLAGS     = /Y- /TC /WX- /Od /Dmain=ReferenceAcpiTable\r
 DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc\r
 \r
+DEFINE IPHONE_TOOLS            = /Developer/Platforms/iPhoneOS.platform/Developer\r
+DEFINE RVCT31_TOOLS_PATH       = c:/Program Files/ARM/RVCT/Programs/3.1/761/win_32-pentium\r
+DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program\ Files/ARM/RVCT/Programs/3.1/761/win_32-pentium\r
+\r
+# Update to the location of the gcc executables\r
+DEFINE ARMGCC_BIN              = /\r
 \r
 ####################################################################################\r
 #\r
@@ -129,7 +137,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 +214,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 +283,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 +362,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 +483,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 +604,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 +725,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 +846,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 +955,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 +1086,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 +1095,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 +1165,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 +1261,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 +1270,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 +1351,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 +1440,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
@@ -1496,8 +1517,8 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_IPF_ASLPP_PATH                = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_ASLDLINK_PATH             = DEF(ICC_BIN64)\xilink.exe\r
 \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_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF /Zi\r
+RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF\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
@@ -1545,7 +1566,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
@@ -1621,8 +1643,8 @@ RELEASE_ICCxASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:408
 *_ICCxASL_IPF_ASLPP_PATH                = DEF(ICC_BIN64)\icl.exe\r
 *_ICCxASL_IPF_ASLDLINK_PATH             = DEF(ICC_BIN64)\xilink.exe\r
 \r
-  DEBUG_ICCxASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
-RELEASE_ICCxASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
+  DEBUG_ICCxASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF /Zi\r
+RELEASE_ICCxASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF\r
   DEBUG_ICCxASL_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
 RELEASE_ICCxASL_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
   DEBUG_ICCxASL_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
@@ -1671,7 +1693,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
@@ -1747,8 +1770,8 @@ RELEASE_ICCx86_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086
 *_ICCx86_IPF_ASLPP_PATH                = DEF(ICC_BIN64x86)\icl.exe\r
 *_ICCx86_IPF_ASLDLINK_PATH             = DEF(ICC_BIN64x86)\xilink.exe\r
 \r
-  DEBUG_ICCx86_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
-RELEASE_ICCx86_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
+  DEBUG_ICCx86_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF /Zi\r
+RELEASE_ICCx86_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF\r
   DEBUG_ICCx86_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
 RELEASE_ICCx86_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
   DEBUG_ICCx86_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
@@ -1797,7 +1820,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
@@ -1873,8 +1897,8 @@ RELEASE_ICCx86xASL_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:
 *_ICCx86xASL_IPF_ASLPP_PATH                = DEF(ICC_BIN64x86)\icl.exe\r
 *_ICCx86xASL_IPF_ASLDLINK_PATH             = DEF(ICC_BIN64x86)\xilink.exe\r
 \r
-  DEBUG_ICCx86xASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi\r
-RELEASE_ICCx86xASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32\r
+  DEBUG_ICCx86xASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF /Zi\r
+RELEASE_ICCx86xASL_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /GF\r
   DEBUG_ICCx86xASL_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -d debug -F COFF32\r
 RELEASE_ICCx86xASL_IPF_ASM_FLAGS                = -N us -X explicit -M ilp64 -N so -W3 -F COFF32\r
   DEBUG_ICCx86xASL_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
@@ -1917,7 +1941,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
@@ -2022,12 +2047,279 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
 *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP\r
 \r
+\r
+####################################################################################\r
+#\r
+# Xcode Support for building on Mac OS X (Snow Leopard)\r
+#\r
+####################################################################################\r
+#   XCODE32         - Xcode 3.2 Tools (Snow Leopard)\r
+*_XCODE32_*_*_FAMILY            = GCC\r
+*_XCODE32_*_*_BUILDRULEFAMILY   = XCODE\r
+\r
+\r
+*_XCODE32_*_ASL_PATH          = /usr/bin/iasl\r
+\r
+*_XCODE32_*_MAKE_PATH        = make\r
+\r
+# This tool needs to be installed seperatly from Xcode 3.2\r
+*_XCODE32_*_MTOC_PATH        = /Developer/usr/bin/mtoc\r
+*_XCODE32_*_DSYMUTIL_PATH    = /usr/bin/dsymutil\r
+\r
+  DEBUG_XCODE32_*_MTOC_FLAGS = -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME).dll\r
+RELEASE_XCODE32_*_MTOC_FLAGS = -align 0x20 \r
+\r
+##################\r
+# IA32 definitions\r
+##################\r
+*_XCODE32_IA32_CC_PATH      = gcc\r
+*_XCODE32_IA32_SLINK_PATH   = libtool\r
+*_XCODE32_IA32_DLINK_PATH   = ld\r
+*_XCODE32_IA32_ASM_PATH     = as\r
+*_XCODE32_IA32_PP_PATH      = gcc\r
+*_XCODE32_IA32_VFRPP_PATH   = gcc\r
+*_XCODE32_IA32_ASL_PATH     = iasl\r
+*_XCODE32_IA32_ASLCC_PATH   = gcc\r
+*_XCODE32_IA32_ASLPP_PATH   = gcc\r
+*_XCODE32_IA32_ASLDLINK_PATH  = ld\r
+\r
+  DEBUG_XCODE32_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -slow_stubs -pie -all_load -dead_strip -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+RELEASE_XCODE32_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -slow_stubs -pie -all_load -dead_strip -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+*_XCODE32_IA32_SLINK_FLAGS      = -static -o\r
+  DEBUG_XCODE32_IA32_ASM_FLAGS  = -arch i386 -g\r
+RELEASE_XCODE32_IA32_ASM_FLAGS  = -arch i386 \r
+*_XCODE32_IA32_PP_FLAGS         = -arch i386 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
+  DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector\r
+RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector\r
+\r
+*_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic\r
+*_XCODE32_IA32_ASLDLINK_FLAGS   = -arch i386 -e _main -preload -segalign 0x20 -slow_stubs -pie -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+*_XCODE32_IA32_ASLPP_FLAGS      = -arch i386 -x c -E \r
+*_XCODE32_IA32_ASL_FLAGS        =\r
+\r
+##################\r
+# X64 definitions - still a work in progress. This tool chain does not produce \r
+# the correct ABI, it is just used to compile the code....\r
+##################\r
+*_XCODE32_X64_CC_PATH       = gcc-4.2\r
+*_XCODE32_X64_SLINK_PATH    = libtool\r
+*_XCODE32_X64_DLINK_PATH    = ld\r
+*_XCODE32_X64_ASM_PATH      = as\r
+*_XCODE32_X64_PP_PATH       = gcc-4.2\r
+*_XCODE32_X64_VFRPP_PATH    = gcc-4.2\r
+*_XCODE32_X64_ASL_PATH     = iasl\r
+*_XCODE32_X64_ASLCC_PATH   = gcc\r
+*_XCODE32_X64_ASLPP_PATH   = gcc\r
+*_XCODE32_X64_ASLDLINK_PATH  = ld\r
+\r
+*_XCODE32_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -slow_stubs -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+*_XCODE32_X64_SLINK_FLAGS      = -static -o\r
+\r
+  DEBUG_XCODE32_X64_ASM_FLAGS  = -arch x86_64 -g\r
+RELEASE_XCODE32_X64_ASM_FLAGS  = -arch x86_64 \r
+*_XCODE32_X64_PP_FLAGS         = -arch x86_64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
+\r
+  DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -combine -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector\r
+RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -combine -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector\r
+\r
+##################\r
+# ARM definitions - still a work in progress (Assumes iPhone SDK installed)\r
+##################\r
+\r
+*_XCODE32_ARM_ARCHCC_FLAGS    = -arch armv6 -march=armv6 -mthumb\r
+*_XCODE32_ARM_ARCHASM_FLAGS   = -arch armv6 \r
+*_XCODE32_ARM_ARCHDLINK_FLAGS = -arch armv6 \r
+*_XCODE32_ARM_PLATFORM_FLAGS  =\r
+*_XCODE32_ARM_INTRINSIC_FLAGS = CompilerIntrinsicsLib.lib\r
+\r
+*_XCODE32_ARM_CC_PATH       = DEF(IPHONE_TOOLS)/usr/bin/gcc\r
+*_XCODE32_ARM_SLINK_PATH    = DEF(IPHONE_TOOLS)/usr/bin/libtool\r
+*_XCODE32_ARM_DLINK_PATH    = DEF(IPHONE_TOOLS)/usr/bin/ld\r
+*_XCODE32_ARM_ASM_PATH      = DEF(IPHONE_TOOLS)/usr/bin/as\r
+*_XCODE32_ARM_PP_PATH       = DEF(IPHONE_TOOLS)/usr/bin/gcc\r
+*_XCODE32_ARM_VFRPP_PATH    = DEF(IPHONE_TOOLS)/usr/bin/gcc\r
+\r
+  DEBUG_XCODE32_ARM_DLINK_FLAGS      = $(ARCHDLINK_FLAGS) -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -slow_stubs -pie -all_load -dead_strip -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map ENV(EDK_TOOLS_PATH)/Bin/Darwin-i386/ARM/DEBUG_XCODE32/$(INTRINSIC_FLAGS)\r
+RELEASE_XCODE32_ARM_DLINK_FLAGS      = $(ARCHDLINK_FLAGS) -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -slow_stubs -pie -all_load -dead_strip -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map ENV(EDK_TOOLS_PATH)/Bin/Darwin-i386/ARM/RELEASE_XCODE32/$(INTRINSIC_FLAGS)\r
+\r
+*_XCODE32_ARM_SLINK_FLAGS      = -static -o\r
+\r
+  DEBUG_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS) -g\r
+RELEASE_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS) \r
+*_XCODE32_ARM_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
+\r
+  DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector\r
+RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector\r
+\r
+\r
+####################################################################################\r
+#\r
+# ARM Tools\r
+#\r
+####################################################################################\r
+#   RVCT31         - Tools from ARM\r
+\r
+*_RVCT31_*_*_FAMILY          = RVCT\r
+\r
+#\r
+# Use default values, or override in DSC file\r
+#\r
+*_RVCT31_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S\r
+*_RVCT31_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S\r
+*_RVCT31_ARM_ARCHDLINK_FLAGS = \r
+*_RVCT31_ARM_PLATFORM_FLAGS  =\r
+*_RVCT31_ARM_INTRINSIC_FLAGS = CompilerIntrinsicsLib.lib\r
+\r
+  DEBUG_RVCT31_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT)  --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map ENV(EDK_TOOLS_PATH)/Bin/Win32/ARM/DEBUG_RVCT31/$(INTRINSIC_FLAGS)\r
+RELEASE_RVCT31_ARM_DLINK_FLAGS     = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT)  --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map ENV(EDK_TOOLS_PATH)/Bin/Win32/ARM/RELEASE_RVCT31/$(INTRINSIC_FLAGS)\r
+\r
+\r
+*_RVCT31_ARM_ASM_FLAGS       = $(ARCHASM_FLAGS) --apcs /interwork\r
+*_RVCT31_ARM_PP_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
+*_RVCT31_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
+*_RVCT31_ARM_MAKE_PATH       = nmake\r
+*_RVCT31_ARM_SLINK_FLAGS     = --partial -o\r
+  DEBUG_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
+RELEASE_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
+\r
+##################\r
+# ARM definitions\r
+##################\r
+*_RVCT31_ARM_CC_PATH         = DEF(RVCT31_TOOLS_PATH)/armcc\r
+*_RVCT31_ARM_SLINK_PATH      = DEF(RVCT31_TOOLS_PATH)/armlink\r
+*_RVCT31_ARM_DLINK_PATH      = DEF(RVCT31_TOOLS_PATH)/armlink\r
+*_RVCT31_ARM_ASM_PATH        = DEF(RVCT31_TOOLS_PATH)/armasm\r
+*_RVCT31_ARM_PP_PATH         = DEF(RVCT31_TOOLS_PATH)/armcc\r
+*_RVCT31_ARM_VFRPP_PATH      = DEF(RVCT31_TOOLS_PATH)/armcc\r
+*_RVCT31_ARM_FROMELF_PATH    = DEF(RVCT31_TOOLS_PATH)/fromelf\r
+\r
+####################################################################################\r
+#\r
+# ARM Tools & Cygwin\r
+#\r
+####################################################################################\r
+#   ARMCYGWIN         - Tools from ARM in a Cygwin environment\r
+\r
+*_RVCT31CYGWIN_*_*_FAMILY               = RVCT\r
+*_RVCT31CYGWIN_*_*_BUILDRULEFAMILY      = RVCTCYGWIN\r
+\r
+*_RVCT31CYGWIN_ARM_CCPATH_FLAG         = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
+*_RVCT31CYGWIN_ARM_SLINKPATH_FLAG      = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink\r
+*_RVCT31CYGWIN_ARM_DLINKPATH_FLAG      = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink\r
+*_RVCT31CYGWIN_ARM_ASMPATH_FLAG        = DEF(RVCT31CYGWIN_TOOLS_PATH)/armasm\r
+*_RVCT31CYGWIN_ARM_PPPATH_FLAG         = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
+*_RVCT31CYGWIN_ARM_VFRPPPATH_FLAG      = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc\r
+*_RVCT31CYGWIN_ARM_FROMELFPATH_FLAG    = DEF(RVCT31CYGWIN_TOOLS_PATH)/fromelf\r
+\r
+\r
+#\r
+# Use default values, or override in DSC file\r
+#\r
+*_RVCT31CYGWIN_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S\r
+*_RVCT31CYGWIN_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S\r
+*_RVCT31CYGWIN_ARM_ARCHDLINK_FLAGS = \r
+*_RVCT31CYGWIN_ARM_PLATFORM_FLAGS  =\r
+*_RVCT31CYGWIN_ARM_INTRINSIC_FLAGS = CompilerIntrinsicsLib.lib\r
+\r
+  DEBUG_RVCT31CYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT)  --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` ENV(EDK_TOOLS_PATH)/Bin/CYGWIN_NT-5.1-i686/ARM/DEBUG_RVCT31CYGWIN/$(INTRINSIC_FLAGS)\r
+RELEASE_RVCT31CYGWIN_ARM_DLINK_FLAGS     = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT)  --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` ENV(EDK_TOOLS_PATH)/Bin/CYGWIN_NT-5.1-i686/ARM/DEBUG_RVCT31CYGWIN/$(INTRINSIC_FLAGS)\r
+\r
+*_RVCT31CYGWIN_ARM_ASM_FLAGS       = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork\r
+*_RVCT31CYGWIN_ARM_PP_FLAGS        = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
+*_RVCT31CYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r
+*_RVCT31CYGWIN_ARM_MAKE_PATH       = make\r
+*_RVCT31CYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial -o\r
+  DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167\r
+RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167\r
+\r
+##################\r
+# ARM definitions\r
+##################\r
+*_RVCT31CYGWIN_ARM_CC_PATH         = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
+*_RVCT31CYGWIN_ARM_SLINK_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
+*_RVCT31CYGWIN_ARM_DLINK_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
+*_RVCT31CYGWIN_ARM_ASM_PATH        = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
+*_RVCT31CYGWIN_ARM_PP_PATH         = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
+*_RVCT31CYGWIN_ARM_VFRPP_PATH      = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
+*_RVCT31CYGWIN_ARM_FROMELF_PATH    = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
+\r
+####################################################################################\r
+#\r
+# ARM GCC (GCC 4.1.1, etc.)\r
+#\r
+####################################################################################\r
+#  ARMGCC         - ARM version of the GCC cross compiler\r
+\r
+*_ARMGCC_*_*_FAMILY          = GCC\r
+*_ARMGCC_*_MAKE_PATH         = make\r
+\r
+##################\r
+# ASL definitions\r
+##################\r
+*_ARMGCC_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
+*_ARMGCCC_*_ASL_FLAGS                    = \r
+*_ARMGCC_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)\r
+*_ARMGCC_*_ASLPP_FLAGS                  = -x c -E -P\r
+*_ARMGCC_*_ASLCC_FLAGS                  = -x c\r
+*_ARMGCC_*_ASLDLINK_FLAGS               = DEF(UNIXGCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
+\r
+##################\r
+# ARM definitions\r
+##################\r
+\r
+*_ARMGCC_ARM_ASLCC_PATH      = DEF(ARMGCC_BIN)/arm-elf-gcc\r
+*_ARMGCC_ARM_ASLDLINK_PATH   = DEF(ARMGCC_BIN)/arm-elf-ld\r
+*_ARMGCC_ARM_ASLPP_PATH      = DEF(ARMGCC_BIN)/arm-elf-gcc\r
+\r
+*_ARMGCC_ARM_CC_PATH         = DEF(ARMGCC_BIN)/arm-elf-gcc\r
+*_ARMGCC_ARM_SLINK_PATH      = DEF(ARMGCC_BIN)/arm-elf-ar\r
+*_ARMGCC_ARM_DLINK_PATH      = DEF(ARMGCC_BIN)/arm-elf-ld\r
+*_ARMGCC_ARM_ASM_PATH        = DEF(ARMGCC_BIN)/arm-elf-as\r
+*_ARMGCC_ARM_PP_PATH         = DEF(ARMGCC_BIN)/arm-elf-gcc\r
+*_ARMGCC_ARM_VFRPP_PATH      = DEF(ARMGCC_BIN)/arm-elf-gcc\r
+\r
+#\r
+# Use default values, or override in DSC file\r
+#\r
+*_ARMGCC_ARM_ARCHCC_FLAGS    = \r
+*_ARMGCC_ARM_ARCHASM_FLAGS   = \r
+*_ARMGCC_ARM_ARCHDLINK_FLAGS = \r
+*_ARMGCC_ARM_PLATFORM_FLAGS  =\r
+*_ARMGCC_ARM_INTRINSIC_FLAGS = CompilerIntrinsicsLib.lib\r
+\r
+  DEBUG_ARMGCC_ARM_ASM_FLAGS   = $(ARCHASM_FLAGS) -mlittle-endian -g\r
+RELEASE_ARMGCC_ARM_ASM_FLAGS   = $(ARCHASM_FLAGS) -mlittle-endian\r
+\r
+*_ARMGCC_ARM_PP_FLAGS    = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)  -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
+*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS)  -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
+\r
+*_ARMGCC_ARM_MAKE_PATH   = make\r
+\r
+*_ARMGCC_ARM_SLINK_FLAGS = -r\r
+*_ARMGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) --emit-relocs --oformat=elf32-littlearm -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+# --gc-sections\r
+\r
+  DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mfpu=fpa -mlittle-endian -g -O2 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
+RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mfpu=fpa -mlittle-endian    -O2 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
+\r
+\r
+\r
+\r
 ##################\r
 # VfrCompiler definitions\r
 ##################\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
@@ -2037,8 +2329,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