Add ASL_OUTFLAG to contain the different ASL output options.

ASL_FLAG to contain other ASL options.

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

2 files changed, 38 insertions, 21 deletions

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 50640be6f..1fb91990d 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -280,12 +280,12 @@
     <Command.MSFT, Command.INTEL>

         Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i ${src}

         "$(ASLPP)" $(ASLPP_FLAGS) $(INC) /I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

-        "$(ASL)" $(ASL_FLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

+        "$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

 

     <Command.GCC>

         Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i ${src}

         "$(ASLPP)" $(ASLPP_FLAGS) $(INC) -I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

-        "$(ASL)" $(ASL_FLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

+        "$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

 

 [C-Code-File.AcpiTable]

     <InputFile>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 8e28880f1..808c98c94 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -88,8 +88,8 @@ DEFINE WIN_ASL_BIN_DIR         = C:\ASL
 DEFINE WIN_IASL_BIN            = DEF(WIN_ASL_BIN_DIR)\iasl.exe

 DEFINE WIN_ASL_BIN             = DEF(WIN_ASL_BIN_DIR)\asl.exe

 

-DEFINE IASL_FLAGS              = -p

-DEFINE MS_ASL_FLAGS            = /Fo=

+DEFINE IASL_OUTFLAGS           = -p

+DEFINE MS_ASL_OUTFLAGS         = /Fo=

 

 DEFINE MSFT_ASLPP_FLAGS        = /nologo /EP /C

 DEFINE MSFT_ASLCC_FLAGS        = /GL- /Y- /TC /Dmain=ReferenceAcpiTable

@@ -206,7 +206,8 @@ DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYS
 # ASL definitions

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

 *_VS2003_*_ASL_PATH                 = DEF(WIN_IASL_BIN)

-*_VS2003_*_ASL_FLAGS                = DEF(IASL_FLAGS)

+*_VS2003_*_ASL_FLAGS                = 

+*_VS2003_*_ASL_OUTFLAGS             = DEF(IASL_OUTFLAGS)

 *_VS2003_*_ASLCC_FLAGS              = DEF(MSFT_ASLCC_FLAGS)

 *_VS2003_*_ASLPP_FLAGS              = DEF(MSFT_ASLPP_FLAGS)

 *_VS2003_*_ASLDLINK_FLAGS           = DEF(MSFT_ASLDLINK_FLAGS)

@@ -274,7 +275,8 @@ RELEASE_VS2003_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:RE
 # ASL definitions

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

 *_VS2003xASL_*_ASL_PATH                 = DEF(WIN_ASL_BIN)

-*_VS2003xASL_*_ASL_FLAGS                = DEF(MS_ASL_FLAGS)

+*_VS2003xASL_*_ASL_FLAGS                = 

+*_VS2003xASL_*_ASL_OUTFLAGS             = DEF(MS_ASL_OUTFLAGS)

 *_VS2003xASL_*_ASLCC_FLAGS              = DEF(MSFT_ASLCC_FLAGS)

 *_VS2003xASL_*_ASLPP_FLAGS              = DEF(MSFT_ASLPP_FLAGS)

 *_VS2003xASL_*_ASLDLINK_FLAGS           = DEF(MSFT_ASLDLINK_FLAGS)

@@ -352,7 +354,8 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 # ASL definitions

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

 *_VS2005_*_ASL_PATH               = DEF(WIN_IASL_BIN)

-*_VS2005_*_ASL_FLAGS              = DEF(IASL_FLAGS)

+*_VS2005_*_ASL_FLAGS              = 

+*_VS2005_*_ASL_OUTFLAGS           = DEF(IASL_OUTFLAGS)

 *_VS2005_*_ASLCC_FLAGS            = DEF(MSFT_ASLCC_FLAGS)

 *_VS2005_*_ASLPP_FLAGS            = DEF(MSFT_ASLPP_FLAGS)

 *_VS2005_*_ASLDLINK_FLAGS         = DEF(MSFT_ASLDLINK_FLAGS)

@@ -472,7 +475,8 @@ RELEASE_VS2005_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF
 # ASL definitions

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

 *_VS2005xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)

-*_VS2005xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)

+*_VS2005xASL_*_ASL_FLAGS       = 

+*_VS2005xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)

 *_VS2005xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)

 *_VS2005xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)

 *_VS2005xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)

@@ -592,7 +596,8 @@ RELEASE_VS2005xASL_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.
 # ASL definitions

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

 *_VS2005x86_*_ASL_PATH        = DEF(WIN_IASL_BIN)

-*_VS2005x86_*_ASL_FLAGS       = DEF(IASL_FLAGS)

+*_VS2005x86_*_ASL_FLAGS       = 

+*_VS2005x86_*_ASL_OUTFLAGS    = DEF(IASL_OUTFLAGS)

 *_VS2005x86_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)

 *_VS2005x86_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)

 *_VS2005x86_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)

@@ -712,7 +717,8 @@ RELEASE_VS2005x86_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.I
 # ASL definitions

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

 *_VS2005x86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)

-*_VS2005x86xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)

+*_VS2005x86xASL_*_ASL_FLAGS       = 

+*_VS2005x86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)

 *_VS2005x86xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)

 *_VS2005x86xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)

 *_VS2005x86xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)

@@ -832,7 +838,8 @@ RELEASE_VS2005x86xASL_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R
 # ASL definitions

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

 *_DDK3790_*_ASL_PATH        = DEF(WIN_IASL_BIN)

-*_DDK3790_*_ASL_FLAGS       = DEF(IASL_FLAGS)

+*_DDK3790_*_ASL_FLAGS       = 

+*_DDK3790_*_ASL_OUTFLAGS    = DEF(IASL_OUTFLAGS)

 *_DDK3790_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)

 *_DDK3790_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)

 *_DDK3790_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)

@@ -940,7 +947,8 @@ RELEASE_DDK3790_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF
 # ASL definitions

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

 *_DDK3790xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)

-*_DDK3790xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)

+*_DDK3790xASL_*_ASL_FLAGS       = 

+*_DDK3790xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)

 *_DDK3790xASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)

 *_DDK3790xASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)

 *_DDK3790xASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)

@@ -1070,7 +1078,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # ASL definitions

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

 *_UNIXGCC_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

-*_UNIXGCC_*_ASL_FLAGS                    = DEF(IASL_FLAGS)

+*_UNIXGCC_*_ASL_FLAGS                    = 

+*_UNIXGCC_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)

 *_UNIXGCC_*_ASLPP_FLAGS                  = -x c -E -P

 *_UNIXGCC_*_ASLCC_FLAGS                  = -x c

 *_UNIXGCC_*_ASLDLINK_FLAGS               = DEF(UNIXGCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable

@@ -1148,9 +1157,10 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # ASL definitions

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

 *_CYGGCC_*_ASL_PATH                   = DEF(WIN_IASL_BIN)

+*_CYGGCC_*_ASL_FLAGS                  = 

+*_CYGGCC_*_ASL_OUTFLAGS               = DEF(IASL_OUTFLAGS)

 *_CYGGCC_*_ASLPP_FLAGS                = -x c -E -P

 *_CYGGCC_*_ASLCC_FLAGS                = -x c

-*_CYGGCC_*_ASL_FLAGS                  = DEF(IASL_FLAGS)

 *_CYGGCC_*_ASLDLINK_FLAGS             = -nostdlib -s --pie --gc-sections --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)

 

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

@@ -1243,7 +1253,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # ASL definitions

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

 *_CYGGCCxASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)

-*_CYGGCCxASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)

+*_CYGGCCxASL_*_ASL_FLAGS       = 

+*_CYGGCCxASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)

 *_CYGGCCxASL_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)

 *_CYGGCCxASL_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)

 *_CYGGCCxASL_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)

@@ -1332,7 +1343,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # ASL definitions

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

 *_ELFGCC_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

-*_ELFGCC_*_ASL_FLAGS                    = DEF(IASL_FLAGS)

+*_ELFGCC_*_ASL_FLAGS                    = 

+*_ELFGCC_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)

 *_ELFGCC_*_ASLPP_FLAGS                  = -x c -E -P

 *_ELFGCC_*_ASLCC_FLAGS                  = -x c

 *_ELFGCC_*_ASLDLINK_FLAGS               = DEF(UNIXGCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable

@@ -1420,7 +1432,8 @@ DEFINE UNIXGCC_DLINK_FLAGS_COMMON        = -nostdlib -s --pie
 # ASL definitions

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

 *_ICC_*_ASL_PATH        = DEF(WIN_IASL_BIN)

-*_ICC_*_ASL_FLAGS       = DEF(IASL_FLAGS)

+*_ICC_*_ASL_FLAGS       = 

+*_ICC_*_ASL_OUTFLAGS    = DEF(IASL_OUTFLAGS)

 *_ICC_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)

 *_ICC_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)

 *_ICC_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)

@@ -1545,7 +1558,8 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 # ASL definitions

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

 *_ICCxASL_*_ASL_PATH        = DEF(WIN_IASL_BIN)

-*_ICCxASL_*_ASL_FLAGS       = DEF(IASL_FLAGS)

+*_ICCxASL_*_ASL_FLAGS       =

+*_ICCxASL_*_ASL_OUTFLAGS    = DEF(IASL_OUTFLAGS)

 *_ICCxASL_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)

 *_ICCxASL_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)

 *_ICCxASL_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)

@@ -1671,7 +1685,8 @@ RELEASE_ICCxASL_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL
 # ASL definitions

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

 *_ICCx86_*_ASL_PATH        = DEF(WIN_IASL_BIN)

-*_ICCx86_*_ASL_FLAGS       = DEF(IASL_FLAGS)

+*_ICCx86_*_ASL_FLAGS       =

+*_ICCx86_*_ASL_OUTFLAGS    = DEF(IASL_OUTFLAGS)

 *_ICCx86_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)

 *_ICCx86_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)

 *_ICCx86_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)

@@ -1797,7 +1812,8 @@ RELEASE_ICCx86_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /
 # ASL definitions

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

 *_ICCx86xASL_*_ASL_PATH        = DEF(WIN_ASL_BIN)

-*_ICCx86xASL_*_ASL_FLAGS       = DEF(MS_ASL_FLAGS)

+*_ICCx86xASL_*_ASL_FLAGS       =

+*_ICCx86xASL_*_ASL_OUTFLAGS    = DEF(MS_ASL_OUTFLAGS)

 *_ICCx86xASL_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)

 *_ICCx86xASL_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)

 *_ICCx86xASL_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)

@@ -1917,7 +1933,8 @@ RELEASE_ICCx86xASL_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /D
 # ASL definitions

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

 *_MYTOOLS_*_ASL_PATH        = DEF(WIN_IASL_BIN)

-*_MYTOOLS_*_ASL_FLAGS       = DEF(IASL_FLAGS)

+*_MYTOOLS_*_ASL_FLAGS       =

+*_MYTOOLS_*_ASL_OUTFLAGS    = DEF(IASL_OUTFLAGS)

 *_MYTOOLS_*_ASLCC_FLAGS     = DEF(ICC_WIN_ASLCC_FLAGS)

 *_MYTOOLS_*_ASLPP_FLAGS     = DEF(ICC_WIN_ASLPP_FLAGS)

 *_MYTOOLS_*_ASLDLINK_FLAGS  = DEF(ICC_WIN_ASLDLINK_FLAGS)