Re: [Patch 1/2] BaseTools tools_def.txt: Remove -P option in GCC ASLPP_FLAGS

[Ard Biesheuvel <ard.biesheuvel@linaro.org>]

On 14 November 2016 at 06:37, Liming Gao <liming.gao@intel.com> wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=227
>
> After -P option is removed, the generated preprocessed ASL file will have
> line markers. The extra information can be removed by Trim script. ASL code
> can refer to the definition in C source file. This has been supported in
> VS and XCODE tool chains.
>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Conf/tools_def.template | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>

This patch is breaking the build on some AArch64 platforms:

Intel ACPI Component Architecture
Error    6126 - syntax error, unexpected PARSEOP_NAMESEG, expecting
PARSEOP_DEFINITION_BLOCK and premature End-Of-File
ASL+ Optimizing Compiler version 20160831-64

and the DSDT.iiii source file has these lines at the beginning

"""
extern UINT8 _VerifySizeofBOOLEAN[(sizeof(BOOLEAN) == (1)) /
(sizeof(BOOLEAN) == (1))];
extern UINT8 _VerifySizeofINT8[(sizeof(INT8) == (1)) / (sizeof(INT8) == (1))];
extern UINT8 _VerifySizeofUINT8[(sizeof(UINT8) == (1)) /
(sizeof(UINT8) == (1))];
extern UINT8 _VerifySizeofINT16[(sizeof(INT16) == (2)) /
(sizeof(INT16) == (2))];
extern UINT8 _VerifySizeofUINT16[(sizeof(UINT16) == (2)) /
(sizeof(UINT16) == (2))];
extern UINT8 _VerifySizeofINT32[(sizeof(INT32) == (4)) /
(sizeof(INT32) == (4))];
extern UINT8 _VerifySizeofUINT32[(sizeof(UINT32) == (4)) /
(sizeof(UINT32) == (4))];
extern UINT8 _VerifySizeofINT64[(sizeof(INT64) == (8)) /
(sizeof(INT64) == (8))];
extern UINT8 _VerifySizeofUINT64[(sizeof(UINT64) == (8)) /
(sizeof(UINT64) == (8))];
extern UINT8 _VerifySizeofCHAR8[(sizeof(CHAR8) == (1)) /
(sizeof(CHAR8) == (1))];
extern UINT8 _VerifySizeofCHAR16[(sizeof(CHAR16) == (2)) /
(sizeof(CHAR16) == (2))];
extern UINT8 _VerifySizeof__VERIFY_UINT8_ENUM_SIZE[(sizeof(__VERIFY_UINT8_ENUM_SIZE)
== (4)) / (sizeof(__VERIFY_UINT8_ENUM_SIZE) == (4))];
extern UINT8 _VerifySizeof__VERIFY_UINT16_ENUM_SIZE[(sizeof(__VERIFY_UINT16_ENUM_SIZE)
== (4)) / (sizeof(__VERIFY_UINT16_ENUM_SIZE) == (4))];
extern UINT8 _VerifySizeof__VERIFY_UINT32_ENUM_SIZE[(sizeof(__VERIFY_UINT32_ENUM_SIZE)
== (4)) / (sizeof(__VERIFY_UINT32_ENUM_SIZE) == (4))];
struct _LIST_ENTRY {
  LIST_ENTRY *ForwardLink;
  LIST_ENTRY *BackLink;
};
  void * __builtin_return_address (unsigned int level);
extern GUID gEfiCallerIdGuid;
extern CHAR8 *gEfiCallerBaseName;
"""


> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
> index 39fda78..fd56ff3 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 -P
> +DEFINE GCC_ASLPP_FLAGS             = -x c -E
>  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 -P
> +*_ELFGCC_*_ASLPP_FLAGS                  = -x c -E
>  *_ELFGCC_*_ASLCC_FLAGS                  = -x c
>  *_ELFGCC_*_ASLDLINK_FLAGS               = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable
>
> --
> 2.8.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel