Minor change to remove /GL- option unsupported by ICC tool chain.

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 9318e3f4be9e3523a8b689027b46ee0ddecfaa84..5ba0648e6fe0fafed7f2586207b317e249a06b3a 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -145,13 +145,17 @@ DEFINE ASL_BIN = C:\ASL
 *_VS2003_IA32_PP_PATH               = DEF(VSNET2003_BIN)\cl.exe\r
 *_VS2003_IA32_ASM_PATH              = DEF(VSNET2003_BIN)\ml.exe\r
 *_VS2003_IA32_PCH_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
+*_VS2003_IA32_ASLCC_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
+*_VS2003_IA32_ASLPP_PATH            = DEF(VSNET2003_BIN)\cl.exe\r
+*_VS2003_IA32_ASLDLINK_PATH         = DEF(VSNET2003_BIN)\link.exe\r
+\r
 \r
       *_VS2003_IA32_MAKE_FLAGS           = /nologo\r
       *_VS2003_IA32_APP_FLAGS            = /nologo /E /TC\r
       *_VS2003_IA32_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
       *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
   DEBUG_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm\r
-RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- \r
+RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-\r
   DEBUG_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
 RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
@@ -192,12 +196,16 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_IA32_APP_PATH           = DEF(VS2005PRO_BIN)\cl.exe\r
 *_VS2005PRO_IA32_PP_PATH            = DEF(VS2005PRO_BIN)\cl.exe\r
 *_VS2005PRO_IA32_ASM_PATH           = DEF(VS2005PRO_BIN)\ml.exe\r
+*_VS2005PRO_IA32_ASLCC_PATH         = DEF(VS2005PRO_BIN)\cl.exe\r
+*_VS2005PRO_IA32_ASLPP_PATH         = DEF(VS2005PRO_BIN)\cl.exe\r
+*_VS2005PRO_IA32_ASLDLINK_PATH      = DEF(VS2005PRO_BIN)\link.exe\r
+\r
 \r
   DEBUG_VS2005PRO_IA32_CC_FLAGS          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_VS2005PRO_IA32_CC_FLAGS          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd /Zi  \r
+  DEBUG_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd\r
-  DEBUG_VS2005PRO_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
+  DEBUG_VS2005PRO_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_VS2005PRO_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
       *_VS2005PRO_IA32_ASMLINK_FLAGS     = /nologo /tiny\r
 \r
@@ -214,8 +222,11 @@ RELEASE_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_X64_SLINK_PATH          = DEF(VS2005PRO_BINX64)\lib.exe\r
 *_VS2005PRO_X64_DLINK_PATH          = DEF(VS2005PRO_BINX64)\link.exe\r
 *_VS2005PRO_X64_ASMLINK_PATH        = DEF(VS2005PRO_BINX64)\link.exe\r
+*_VS2005PRO_X64_ASLCC_PATH          = DEF(VS2005PRO_BINX64)\cl.exe\r
+*_VS2005PRO_X64_ASLPP_PATH          = DEF(VS2005PRO_BINX64)\cl.exe\r
+*_VS2005PRO_X64_ASLDLINK_PATH       = DEF(VS2005PRO_BINX64)\link.exe\r
 \r
-  DEBUG_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_VS2005PRO_X64_ASM_FLAGS          = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2005PRO_X64_ASM_FLAGS          = /nologo /c /WX /W3 /Cx /Zd\r
@@ -252,13 +263,16 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_IA32_APP_PATH     = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
 *_VS2005TEAMSUITE_IA32_PP_PATH      = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
 *_VS2005TEAMSUITE_IA32_ASM_PATH     = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
+*_VS2005TEAMSUITE_IA32_ASLCC_PATH    = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_ASLPP_PATH    = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_VS2005TEAMSUITE_IA32_ASLDLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\link.exe\r
 \r
       *_VS2005TEAMSUITE_IA32_MAKE_FLAGS  = /nologo\r
   DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
 RELEASE_VS2005TEAMSUITE_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi  \r
+  DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-  DEBUG_VS2005TEAMSUITE_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
+  DEBUG_VS2005TEAMSUITE_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_VS2005TEAMSUITE_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
       *_VS2005TEAMSUITE_IA32_ASMLINK_FLAGS= /nologo /tiny\r
 \r
@@ -274,8 +288,12 @@ RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_X64_ASM_PATH      = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe\r
 *_VS2005TEAMSUITE_X64_SLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\lib.exe\r
 *_VS2005TEAMSUITE_X64_DLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
+*_VS2005TEAMSUITE_X64_ASLCC_PATH    = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_ASLPP_PATH    = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_VS2005TEAMSUITE_X64_ASLDLINK_PATH = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
+\r
 \r
-  DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -294,6 +312,9 @@ RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_IPF_ASM_PATH      = DEF(VS2005TEAMSUITE_BIN64)\ias.exe\r
 *_VS2005TEAMSUITE_IPF_SLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\lib.exe\r
 *_VS2005TEAMSUITE_IPF_DLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\link.exe\r
+*_VS2005TEAMSUITE_IPF_ASLCC_PATH    = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_ASLPP_PATH    = DEF(VS2005TEAMSUITE_BIN64)\cl.exe\r
+*_VS2005TEAMSUITE_IPF_ASLDLINK_PATH = DEF(VS2005TEAMSUITE_BIN64)\link.exe\r
 \r
   DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi\r
 RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32\r
@@ -335,6 +356,9 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_IA32_APP_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_PCH_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
 *_WINDDK3790x1830_IA32_ASM_PATH     = DEF(WINDDK_BIN32)\ml.exe\r
+*_WINDDK3790x1830_IA32_ASLCC_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
+*_WINDDK3790x1830_IA32_ASLPP_PATH     = DEF(WINDDK_BIN32)\cl.exe\r
+*_WINDDK3790x1830_IA32_ASLDLINK_PATH  = DEF(WINDDK_BIN32)\link.exe\r
 \r
   DEBUG_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
@@ -358,6 +382,9 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_X64_APP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_PCH_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
 *_WINDDK3790x1830_X64_ASM_PATH     = DEF(WINDDK_BINX64)\ml64.exe\r
+*_WINDDK3790x1830_X64_ASLCC_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_ASLPP_PATH     = DEF(WINDDK_BINX64)\cl.exe\r
+*_WINDDK3790x1830_X64_ASLDLINK_PATH  = DEF(WINDDK_BINX64)\link.exe\r
 \r
   DEBUG_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
@@ -380,6 +407,10 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_IPF_APP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
 *_WINDDK3790x1830_IPF_ASM_PATH     = DEF(WINDDK_BIN64)\ias.exe\r
+*_WINDDK3790x1830_IPF_ASLCC_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_ASLPP_PATH     = DEF(WINDDK_BIN64)\cl.exe\r
+*_WINDDK3790x1830_IPF_ASLDLINK_PATH  = DEF(WINDDK_BIN64)\link.exe\r
+\r
 \r
   DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi\r
 RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32\r
@@ -459,6 +490,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20\r
 *_CYGWINGCC_*_ASM_FLAGS                  = -c -x assembler -imacros AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
+*_CYGWINGCC_*_APP_FLAGS                  = -E -x assembler\r
 *_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
 ##################\r
@@ -469,6 +501,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_IA32_DLINK_PATH         = DEF(CYGWIN_BIN32)/ld\r
 *_CYGWINGCC_IA32_ASM_PATH           = DEF(CYGWIN_BIN32)/gcc\r
 *_CYGWINGCC_IA32_PP_PATH            = DEF(CYGWIN_BIN32)/gcc\r
+*_CYGWINGCC_IA32_APP_PATH           = DEF(CYGWIN_BIN32)/gcc\r
 *_CYGWINGCC_IA32_VFRPP_PATH         = DEF(CYGWIN_BIN32)/gcc\r
 \r
 *_CYGWINGCC_IA32_CC_FLAGS           = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h\r
@@ -481,6 +514,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_X64_DLINK_PATH          = DEF(CYGWIN_BINX64)/ld\r
 *_CYGWINGCC_X64_ASM_PATH            = DEF(CYGWIN_BINX64)/gcc\r
 *_CYGWINGCC_X64_PP_PATH             = DEF(CYGWIN_BINX64)/gcc\r
+*_CYGWINGCC_X64_APP_PATH            = DEF(CYGWIN_BINX64)/gcc\r
 *_CYGWINGCC_X64_VFRPP_PATH          = DEF(CYGWIN_BINX64)/gcc\r
 \r
 *_CYGWINGCC_X64_CC_FLAGS            = -Os -fshort-wchar -fno-strict-aliasing -mno-red-zone -Wall -Werror -c -include AutoGen.h -D_EFI_P64\r
@@ -566,6 +600,10 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC\r
 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h\r
 \r
+*_ICC_*_ASLCC_FLAGS                      = /Y- /TC /WX-\r
+*_ICC_*_ASLDLINK_FLAGS                   = /NODEFAULTLIB /ENTRY:main /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc\r
+*_ICC_*_ASLPP_FLAGS                      = /nologo /EP /C\r
+\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -581,6 +619,9 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_IA32_APP_PATH                 = DEF(ICC_BIN32)\icl.exe\r
 *_ICC_IA32_ASM_PATH                 = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
 *_ICC_IA32_ASM_DLL                  = DEF(VS2005TEAMSUITE_DLL)\r
+*_ICC_IA32_ASLCC_PATH               = DEF(ICC_BIN32)\icl.exe\r
+*_ICC_IA32_ASLPP_PATH               = DEF(ICC_BIN32)\icl.exe\r
+*_ICC_IA32_ASLDLINK_PATH            = DEF(ICC_BIN32)\xilink.exe\r
 \r
   DEBUG_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF /Zi /Gm\r
 RELEASE_ICC_IA32_CC_FLAGS                = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /FIAutoGen.h /EHs-c- /GF\r
@@ -607,6 +648,9 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_X64_APP_PATH                  = DEF(ICC_BINX64)\icl.exe\r
 *_ICC_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe\r
 *_ICC_X64_ASM_DLL                   = DEF(VS2005TEAMSUITE_DLL)\r
+*_ICC_X64_ASLCC_PATH                = DEF(ICC_BINX64)\icl.exe\r
+*_ICC_X64_ASLPP_PATH                = DEF(ICC_BINX64)\icl.exe\r
+*_ICC_X64_ASLDLINK_PATH             = DEF(ICC_BINX64)\xilink.exe\r
 \r
   DEBUG_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
 RELEASE_ICC_X64_CC_FLAGS                 = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
@@ -632,10 +676,12 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_IPF_ASMLINK_PATH              = DEF(ICC_BIN64)\xilink.exe\r
 *_ICC_IPF_PP_PATH                   = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_VFRPP_PATH                = DEF(ICC_BIN64)\icl.exe\r
-\r
 *_ICC_IPF_PCH_PATH                  = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_APP_PATH                  = DEF(ICC_BIN64)\icl.exe\r
 *_ICC_IPF_ASM_PATH                  = DEF(ICC_BIN64)\ias.exe\r
+*_ICC_IPF_ASLCC_PATH                = DEF(ICC_BIN64)\icl.exe\r
+*_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
@@ -664,7 +710,6 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
-*_MYTOOLS_*_ASL_FLAGS                    = \r
 *_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
 *_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 *_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC\r
@@ -691,8 +736,11 @@ RELEASE_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd
 *_MYTOOLS_IA32_VFRPP_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
 *_MYTOOLS_IA32_APP_PATH             = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
 *_MYTOOLS_IA32_ASM_PATH             = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
+*_MYTOOLS_IA32_ASLCC_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_ASLPP_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_ASLDLINK_PATH        = DEF(VS2005TEAMSUITE_BIN)\link.exe\r
 \r
-  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
 RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd\r
@@ -713,8 +761,11 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_X64_VFRPP_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
 *_MYTOOLS_X64_APP_PATH              = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
 *_MYTOOLS_X64_ASM_PATH              = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe\r
+*_MYTOOLS_X64_ASLCC_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_ASLPP_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_ASLDLINK_PATH         = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
 \r
-  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /Cx /Zd\r
@@ -733,11 +784,13 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_IPF_VFRPP_PATH            = DEF(WINDDK_BIN64)\cl.exe\r
 *_MYTOOLS_IPF_APP_PATH              = DEF(WINDDK_BIN64)\cl.exe\r
 *_MYTOOLS_IPF_ASM_PATH              = DEF(WINDDK_BIN64)\ias.exe\r
-\r
+*_MYTOOLS_IPF_ASLCC_PATH            = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_ASLPP_PATH            = DEF(WINDDK_BIN64)\cl.exe\r
+*_MYTOOLS_IPF_ASLDLINK_PATH         = DEF(WINDDK_BIN64)\link.exe\r
       *_MYTOOLS_IPF_ASM_OUTPUT           = "-o "\r
 \r
   DEBUG_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32 /Zi\r
-RELEASE_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32 \r
+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32\r
   DEBUG_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
 RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4\r
   DEBUG_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG\r
@@ -766,5 +819,13 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\r
 # VfrCompiler definitions\r
 ##################\r
-*_*_*_VFR_PATH                      = VfrCompile.exe\r
+*_*_*_VFR_PATH                      = VfrCompile\r
 *_*_*_VFR_FLAGS                     = -l -n\r
+\r
+##################\r
+# Asl Compiler definitions\r
+##################\r
+*_*_*_ASLCC_FLAGS                  = /GL- /Y- /TC\r
+*_*_*_ASLDLINK_FLAGS               = /NODEFAULTLIB /ENTRY:main\r
+*_*_*_ASLPP_FLAGS                  = /nologo /EP /C\r
+*_*_*_ASL_FLAGS                    =\r