Reviewed-by: Bob Feng <bob.c.f...@intel.com> -----Original Message----- From: Liming Gao <gaolim...@byosoft.com.cn> Sent: Friday, September 25, 2020 3:49 PM To: devel@edk2.groups.io Cc: gaoliming <gaolim...@byosoft.com.cn>; Feng, Bob C <bob.c.f...@intel.com>; Chen, Christine <yuwei.c...@intel.com>; Kinney, Michael D <michael.d.kin...@intel.com> Subject: [edk2-devel] [PATCH v2 1/1] BaseTools: Copy PACKED definition from MdePkg Base.h
From: gaoliming <gaolim...@byosoft.com.cn> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2938 MdePkg Acpi10.h definition depends on PACKED. When structure PCD refers to Acpi10.h, build will fail, because PACKED definition is missing in BaseTools BaseTypes.h. C source tools include BaseTools BaseTypes.h. They don't include MdePkg Base.h. When C source tools include MdePkg Acpi10.h, they also need PACKED definition. So, add PACKED definition into BaseTools BaseTypes.h. Cc: Bob Feng <bob.c.f...@intel.com> Cc: Yuwei Chen <yuwei.c...@intel.com> Cc: Michael Kinney <michael.d.kin...@intel.com> Signed-off-by: Liming Gao <gaolim...@byosoft.com.cn> --- V2: update the commit message. BaseTools/Source/C/Include/Common/BaseTypes.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h index 31d0662085a8..150980b4c0bf 100644 --- a/BaseTools/Source/C/Include/Common/BaseTypes.h +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h @@ -57,6 +57,16 @@ #define NULL ((VOID *) 0) #endif +#ifdef __CC_ARM + // + // Older RVCT ARM compilers don't fully support #pragma pack and +require __packed + // as a prefix for the structure. + // + #define PACKED __packed +#else + #define PACKED +#endif + // // Support for variable length argument lists using the ANSI standard. // -- 2.27.0.windows.1 GitPatchExtractor 1.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#65709): https://edk2.groups.io/g/devel/message/65709 Mute This Topic: https://groups.io/mt/77075080/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
