Update GenSec to handle the input file whose size is Zero. And add the unified ASL tool path and flags for ASL code.

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

1 files changed, 61 insertions, 3 deletions

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 8b52138a5f..025c8ef679 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -145,6 +145,10 @@ DEFINE ASL_BIN = C:\ASL
 *_VS2003_IA32_PP_PATH               = DEF(VSNET2003_BIN)\cl.exe

 *_VS2003_IA32_ASM_PATH              = DEF(VSNET2003_BIN)\ml.exe

 *_VS2003_IA32_PCH_PATH              = DEF(VSNET2003_BIN)\cl.exe

+*_VS2003_IA32_ASLCC_PATH            = DEF(VSNET2003_BIN)\cl.exe

+*_VS2003_IA32_ASLPP_PATH            = DEF(VSNET2003_BIN)\cl.exe

+*_VS2003_IA32_ASLDLINK_PATH         = DEF(VSNET2003_BIN)\link.exe

+

 

       *_VS2003_IA32_MAKE_FLAGS           = /nologo

       *_VS2003_IA32_APP_FLAGS            = /nologo /E /TC

@@ -192,6 +196,10 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_IA32_APP_PATH           = DEF(VS2005PRO_BIN)\cl.exe

 *_VS2005PRO_IA32_PP_PATH            = DEF(VS2005PRO_BIN)\cl.exe

 *_VS2005PRO_IA32_ASM_PATH           = DEF(VS2005PRO_BIN)\ml.exe

+*_VS2005PRO_IA32_ASLCC_PATH         = DEF(VS2005PRO_BIN)\cl.exe

+*_VS2005PRO_IA32_ASLPP_PATH         = DEF(VS2005PRO_BIN)\cl.exe

+*_VS2005PRO_IA32_ASLDLINK_PATH      = DEF(VS2005PRO_BIN)\link.exe

+

 

   DEBUG_VS2005PRO_IA32_CC_FLAGS          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm

 RELEASE_VS2005PRO_IA32_CC_FLAGS          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF

@@ -214,6 +222,9 @@ RELEASE_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_X64_SLINK_PATH          = DEF(VS2005PRO_BINX64)\lib.exe

 *_VS2005PRO_X64_DLINK_PATH          = DEF(VS2005PRO_BINX64)\link.exe

 *_VS2005PRO_X64_ASMLINK_PATH        = DEF(VS2005PRO_BINX64)\link.exe

+*_VS2005PRO_X64_ASLCC_PATH          = DEF(VS2005PRO_BINX64)\cl.exe

+*_VS2005PRO_X64_ASLPP_PATH          = DEF(VS2005PRO_BINX64)\cl.exe

+*_VS2005PRO_X64_ASLDLINK_PATH       = DEF(VS2005PRO_BINX64)\link.exe

 

   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

 RELEASE_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF

@@ -252,6 +263,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_IA32_APP_PATH     = DEF(VS2005TEAMSUITE_BIN)\cl.exe

 *_VS2005TEAMSUITE_IA32_PP_PATH      = DEF(VS2005TEAMSUITE_BIN)\cl.exe

 *_VS2005TEAMSUITE_IA32_ASM_PATH     = DEF(VS2005TEAMSUITE_BIN)\ml.exe

+*_VS2005TEAMSUITE_IA32_ASLCC_PATH    = DEF(VS2005TEAMSUITE_BIN)\cl.exe

+*_VS2005TEAMSUITE_IA32_ASLPP_PATH    = DEF(VS2005TEAMSUITE_BIN)\cl.exe

+*_VS2005TEAMSUITE_IA32_ASLDLINK_PATH = DEF(VS2005TEAMSUITE_BIN)\link.exe

 

       *_VS2005TEAMSUITE_IA32_MAKE_FLAGS  = /nologo

   DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm

@@ -274,6 +288,10 @@ RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_X64_ASM_PATH      = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe

 *_VS2005TEAMSUITE_X64_SLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\lib.exe

 *_VS2005TEAMSUITE_X64_DLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\link.exe

+*_VS2005TEAMSUITE_X64_ASLCC_PATH    = DEF(VS2005TEAMSUITE_BINX64)\cl.exe

+*_VS2005TEAMSUITE_X64_ASLPP_PATH    = DEF(VS2005TEAMSUITE_BINX64)\cl.exe

+*_VS2005TEAMSUITE_X64_ASLDLINK_PATH = DEF(VS2005TEAMSUITE_BINX64)\link.exe

+

 

   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

 RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF

@@ -294,6 +312,9 @@ RELEASE_VS2005TEAMSUITE_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_IPF_ASM_PATH      = DEF(VS2005TEAMSUITE_BIN64)\ias.exe

 *_VS2005TEAMSUITE_IPF_SLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\lib.exe

 *_VS2005TEAMSUITE_IPF_DLINK_PATH    = DEF(VS2005TEAMSUITE_BIN64)\link.exe

+*_VS2005TEAMSUITE_IPF_ASLCC_PATH    = DEF(VS2005TEAMSUITE_BIN64)\cl.exe

+*_VS2005TEAMSUITE_IPF_ASLPP_PATH    = DEF(VS2005TEAMSUITE_BIN64)\cl.exe

+*_VS2005TEAMSUITE_IPF_ASLDLINK_PATH = DEF(VS2005TEAMSUITE_BIN64)\link.exe

 

   DEBUG_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi

 RELEASE_VS2005TEAMSUITE_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32

@@ -335,6 +356,9 @@ RELEASE_VS2005TEAMSUITE_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_WINDDK3790x1830_IA32_APP_PATH     = DEF(WINDDK_BIN32)\cl.exe

 *_WINDDK3790x1830_IA32_PCH_PATH     = DEF(WINDDK_BIN32)\cl.exe

 *_WINDDK3790x1830_IA32_ASM_PATH     = DEF(WINDDK_BIN32)\ml.exe

+*_WINDDK3790x1830_IA32_ASLCC_PATH     = DEF(WINDDK_BIN32)\cl.exe

+*_WINDDK3790x1830_IA32_ASLPP_PATH     = DEF(WINDDK_BIN32)\cl.exe

+*_WINDDK3790x1830_IA32_ASLDLINK_PATH  = DEF(WINDDK_BIN32)\link.exe

 

   DEBUG_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm

 RELEASE_WINDDK3790x1830_IA32_CC_FLAGS    = /nologo /c /WX /W4 /Gy /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF

@@ -358,6 +382,9 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_X64_APP_PATH     = DEF(WINDDK_BINX64)\cl.exe

 *_WINDDK3790x1830_X64_PCH_PATH     = DEF(WINDDK_BINX64)\cl.exe

 *_WINDDK3790x1830_X64_ASM_PATH     = DEF(WINDDK_BINX64)\ml64.exe

+*_WINDDK3790x1830_X64_ASLCC_PATH     = DEF(WINDDK_BINX64)\cl.exe

+*_WINDDK3790x1830_X64_ASLPP_PATH     = DEF(WINDDK_BINX64)\cl.exe

+*_WINDDK3790x1830_X64_ASLDLINK_PATH  = DEF(WINDDK_BINX64)\link.exe

 

   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

 RELEASE_WINDDK3790x1830_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF

@@ -380,6 +407,10 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_WINDDK3790x1830_IPF_APP_PATH     = DEF(WINDDK_BIN64)\cl.exe

 *_WINDDK3790x1830_IPF_PCH_PATH     = DEF(WINDDK_BIN64)\cl.exe

 *_WINDDK3790x1830_IPF_ASM_PATH     = DEF(WINDDK_BIN64)\ias.exe

+*_WINDDK3790x1830_IPF_ASLCC_PATH     = DEF(WINDDK_BIN64)\cl.exe

+*_WINDDK3790x1830_IPF_ASLPP_PATH     = DEF(WINDDK_BIN64)\cl.exe

+*_WINDDK3790x1830_IPF_ASLDLINK_PATH  = DEF(WINDDK_BIN64)\link.exe

+

 

   DEBUG_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi

 RELEASE_WINDDK3790x1830_IPF_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32

@@ -569,6 +600,10 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_*_APP_FLAGS                        = /nologo /E /TC

 *_ICC_*_PP_FLAGS                         = /nologo /E /TC /FIAutoGen.h

 

+*_ICC_*_ASLCC_FLAGS                      = /GL- /Y- /TC /WX-

+*_ICC_*_ASLDLINK_FLAGS                   = /NODEFAULTLIB /ENTRY:main /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc

+*_ICC_*_ASLPP_FLAGS                      = /nologo /EP /C

+

 ##################

 # IA32 definitions

 ##################

@@ -584,6 +619,9 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_ICC_IA32_APP_PATH                 = DEF(ICC_BIN32)\icl.exe

 *_ICC_IA32_ASM_PATH                 = DEF(VS2005TEAMSUITE_BIN)\ml.exe

 *_ICC_IA32_ASM_DLL                  = DEF(VS2005TEAMSUITE_DLL)

+*_ICC_IA32_ASLCC_PATH               = DEF(ICC_BIN32)\icl.exe

+*_ICC_IA32_ASLPP_PATH               = DEF(ICC_BIN32)\icl.exe

+*_ICC_IA32_ASLDLINK_PATH            = DEF(ICC_BIN32)\xilink.exe

 

   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

 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

@@ -610,6 +648,9 @@ RELEASE_ICC_IA32_DLINK_FLAGS             = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_X64_APP_PATH                  = DEF(ICC_BINX64)\icl.exe

 *_ICC_X64_ASM_PATH                  = DEF(WINDDK_BINX64)\ml64.exe

 *_ICC_X64_ASM_DLL                   = DEF(VS2005TEAMSUITE_DLL)

+*_ICC_X64_ASLCC_PATH                = DEF(ICC_BINX64)\icl.exe

+*_ICC_X64_ASLPP_PATH                = DEF(ICC_BINX64)\icl.exe

+*_ICC_X64_ASLDLINK_PATH             = DEF(ICC_BINX64)\xilink.exe

 

   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

 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

@@ -635,10 +676,12 @@ RELEASE_ICC_X64_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_ICC_IPF_ASMLINK_PATH              = DEF(ICC_BIN64)\xilink.exe

 *_ICC_IPF_PP_PATH                   = DEF(ICC_BIN64)\icl.exe

 *_ICC_IPF_VFRPP_PATH                = DEF(ICC_BIN64)\icl.exe

-

 *_ICC_IPF_PCH_PATH                  = DEF(ICC_BIN64)\icl.exe

 *_ICC_IPF_APP_PATH                  = DEF(ICC_BIN64)\icl.exe

 *_ICC_IPF_ASM_PATH                  = DEF(ICC_BIN64)\ias.exe

+*_ICC_IPF_ASLCC_PATH                = DEF(ICC_BIN64)\icl.exe

+*_ICC_IPF_ASLPP_PATH                = DEF(ICC_BIN64)\icl.exe

+*_ICC_IPF_ASLDLINK_PATH             = DEF(ICC_BIN64)\xilink.exe

 

   DEBUG_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32 /Zi

 RELEASE_ICC_IPF_CC_FLAGS                 = /nologo /c /WX /W4 /GX /Gy /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /QIA64_fr32

@@ -667,7 +710,6 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 

 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe

 

-*_MYTOOLS_*_ASL_FLAGS                    =

 *_MYTOOLS_*_MAKE_FLAGS                   = /nologo

 *_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h

 *_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC

@@ -694,6 +736,9 @@ RELEASE_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd
 *_MYTOOLS_IA32_VFRPP_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe

 *_MYTOOLS_IA32_APP_PATH             = DEF(VS2005TEAMSUITE_BIN)\cl.exe

 *_MYTOOLS_IA32_ASM_PATH             = DEF(VS2005TEAMSUITE_BIN)\ml.exe

+*_MYTOOLS_IA32_ASLCC_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe

+*_MYTOOLS_IA32_ASLPP_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe

+*_MYTOOLS_IA32_ASLDLINK_PATH        = DEF(VS2005TEAMSUITE_BIN)\link.exe

 

   DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm

 RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF

@@ -716,6 +761,9 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_X64_VFRPP_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe

 *_MYTOOLS_X64_APP_PATH              = DEF(VS2005TEAMSUITE_BINX64)\cl.exe

 *_MYTOOLS_X64_ASM_PATH              = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe

+*_MYTOOLS_X64_ASLCC_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe

+*_MYTOOLS_X64_ASLPP_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe

+*_MYTOOLS_X64_ASLDLINK_PATH         = DEF(VS2005TEAMSUITE_BINX64)\link.exe

 

   DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm

 RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF

@@ -736,7 +784,9 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_IPF_VFRPP_PATH            = DEF(WINDDK_BIN64)\cl.exe

 *_MYTOOLS_IPF_APP_PATH              = DEF(WINDDK_BIN64)\cl.exe

 *_MYTOOLS_IPF_ASM_PATH              = DEF(WINDDK_BIN64)\ias.exe

-

+*_MYTOOLS_IPF_ASLCC_PATH            = DEF(WINDDK_BIN64)\cl.exe

+*_MYTOOLS_IPF_ASLPP_PATH            = DEF(WINDDK_BIN64)\cl.exe

+*_MYTOOLS_IPF_ASLDLINK_PATH         = DEF(WINDDK_BIN64)\link.exe

       *_MYTOOLS_IPF_ASM_OUTPUT           = "-o "

 

   DEBUG_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32 /Zi

@@ -771,3 +821,11 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################

 *_*_*_VFR_PATH                      = VfrCompile

 *_*_*_VFR_FLAGS                     = -l -n

+

+##################

+# Asl Compiler definitions

+##################

+*_*_*_ASLCC_FLAGS                  = /GL- /Y- /TC

+*_*_*_ASLDLINK_FLAGS               = /NODEFAULTLIB /ENTRY:main

+*_*_*_ASLPP_FLAGS                  = /nologo /EP /C

+*_*_*_ASL_FLAGS                    =