https://bugzilla.tianocore.org/show_bug.cgi?id=227
Refer to VS ASLPP_FLAGS, force include AutoGen.h so that ASL code
can use FixedPcdGetXX to get FixedPcd value.

Cc: Yonghong Zhu <yonghong....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming....@intel.com>
---
 BaseTools/Conf/tools_def.template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
index fd56ff3..aaae4fc 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -4359,7 +4359,7 @@ DEFINE GCC_IPF_SYMRENAME_FLAGS     = --redefine-sym 
memcpy=CopyMem
 DEFINE GCC_ASM_FLAGS               = -c -x assembler -imacros 
$(DEST_DIR_DEBUG)/AutoGen.h
 DEFINE GCC_PP_FLAGS                = -E -x assembler-with-cpp -include 
$(DEST_DIR_DEBUG)/AutoGen.h
 DEFINE GCC_VFRPP_FLAGS             = -x c -E -P -DVFRCOMPILE --include 
$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
-DEFINE GCC_ASLPP_FLAGS             = -x c -E
+DEFINE GCC_ASLPP_FLAGS             = -x c -E -include AutoGen.h
 DEFINE GCC_ASLCC_FLAGS             = -x c
 DEFINE GCC_WINDRES_FLAGS           = -J rc -O coff
 DEFINE GCC_IA32_RC_FLAGS           = -I binary -O elf32-i386          -B i386  
  --rename-section .data=.hii
@@ -5804,7 +5804,7 @@ RELEASE_CLANG38_X64_CC_FLAGS       = 
DEF(CLANG38_ALL_CC_FLAGS) -m64 "-DEFIAPI=__
 *_ELFGCC_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)
 *_ELFGCC_*_ASL_FLAGS                    = DEF(IASL_FLAGS)
 *_ELFGCC_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)
-*_ELFGCC_*_ASLPP_FLAGS                  = -x c -E
+*_ELFGCC_*_ASLPP_FLAGS                  = -x c -E -include AutoGen.h
 *_ELFGCC_*_ASLCC_FLAGS                  = -x c
 *_ELFGCC_*_ASLDLINK_FLAGS               = DEF(GCC_DLINK_FLAGS_COMMON) --entry 
_ReferenceAcpiTable
 
@@ -7285,7 +7285,7 @@ RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine 
-mms-bitfields  -fshor
 
 *_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
 *_XCODE32_IA32_ASLDLINK_FLAGS   = -arch i386 -e _main -preload -segalign 0x20  
-pie -seg1addr 0x220 -read_only_relocs suppress -map 
$(DEST_DIR_DEBUG)/$(BASE_NAME).map
-*_XCODE32_IA32_ASLPP_FLAGS      = -arch i386 -x c -E
+*_XCODE32_IA32_ASLPP_FLAGS      = -arch i386 -x c -E -include AutoGen.h
 *_XCODE32_IA32_ASL_FLAGS        =
 
 ##################
@@ -7408,7 +7408,7 @@ RELEASE_XCLANG_X64_ASM_FLAGS  = -arch x86_64
 RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    
-Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin 
-fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign 
-Wno-unused-function -Wno-unused-value -Wno-missing-braces 
-Wno-tautological-compare -Wreturn-type -Wno-unused-variable 
-ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
 *_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar 
-fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h 
-mdynamic-no-pic
 *_XCLANG_*_ASLDLINK_FLAGS   = -e _main -preload -segalign 0x20  -pie -seg1addr 
0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
-*_XCLANG_*_ASLPP_FLAGS      = -x c -E 
+*_XCLANG_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h
 *_XCLANG_*_ASL_FLAGS        =
 
 #
@@ -7484,7 +7484,7 @@ RELEASE_XCODE5_X64_CC_FLAGS   = -target 
x86_64-pc-win32-macho -c    -Os       -W
 
 *_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar 
-fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h 
 *_XCODE5_*_ASLDLINK_FLAGS   = -e _ReferenceAcpiTable -preload -segalign 0x20  
-pie -seg1addr 0x240 -read_only_relocs suppress -map 
$(DEST_DIR_DEBUG)/$(BASE_NAME).map
-*_XCODE5_*_ASLPP_FLAGS      = -x c -E 
+*_XCODE5_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h
 *_XCODE5_*_ASL_FLAGS        =
 *_XCODE5_*_ASL_OUTFLAGS     = DEF(IASL_OUTFLAGS)
 
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to