From: "gaoliming" <gaoliming@byosoft.com.cn>
To: "'Feng, Bob C'" <bob.c.feng@intel.com>,
"'Sean Brogan'" <spbrogan@outlook.com>, <devel@edk2.groups.io>
Cc: "'Chen, Christine'" <yuwei.chen@intel.com>,
"'Kinney, Michael D'" <michael.d.kinney@intel.com>,
"'Sean Brogan'" <sean.brogan@microsoft.com>
Subject: 回复: [edk2-devel] [Patch] BaseTools: Fix PcdValueInit tool build issue with VS compiler x64
Date: Thu, 22 Oct 2020 09:04:29 +0800 [thread overview]
Message-ID: <008501d6a80f$4b8e2170$e2aa6450$@byosoft.com.cn> (raw)
In-Reply-To: <DM6PR11MB4073CB625E3CC3D15F9BD97EC91E0@DM6PR11MB4073.namprd11.prod.outlook.com>
Got it. Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> -----邮件原件-----
> 发件人: Feng, Bob C <bob.c.feng@intel.com>
> 发送时间: 2020年10月19日 9:57
> 收件人: gaoliming <gaoliming@byosoft.com.cn>; 'Sean Brogan'
> <spbrogan@outlook.com>; devel@edk2.groups.io
> 抄送: Chen, Christine <yuwei.chen@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; 'Sean Brogan' <sean.brogan@microsoft.com>
> 主题: RE: [edk2-devel] [Patch] BaseTools: Fix PcdValueInit tool build issue
> with VS compiler x64
>
> Liming,
>
> To reproduce the issue and verify the change locally you can do,
>
> 1. Clone edk2
> a. Git clone https://github.com/tianocore/edk2
> b. Cd edk2
> 2. Add Matts repo as a remote.
> a. git remote add matt https://github.com/matthewfcarlson/edk2.git
> b. git fetch --all --prune
> 3. check out his branch
> a. git checkout matt/personal/macarl/test-array-struct-pcd
> 4. Create a virtual environment
> a. Cd ..
> b. Python -m venv venv
> 5. Activate it
> a. Venv/scripts/activate
> 6. Cd edk2
> 7. Pip install -r pip-requirements.txt
> 8. stuart_setup -c .pytool\CISettings.py -p MdeModulePkg -a X64
> TOOL_CHAIN_TAG=VS2019
> 9. stuart_update -c .pytool\CISettings.py -p MdeModulePkg -a X64
> TOOL_CHAIN_TAG=VS2019
> 10. stuart_ci_build -c .pytool\CISettings.py -p MdeModulePkg -a X64
> TOOL_CHAIN_TAG=VS2019
>
> Thanks,
> Bob
>
> -----Original Message-----
> From: gaoliming <gaoliming@byosoft.com.cn>
> Sent: Monday, October 19, 2020 9:03 AM
> To: 'Sean Brogan' <spbrogan@outlook.com>; devel@edk2.groups.io; Feng,
> Bob C <bob.c.feng@intel.com>
> Cc: Chen, Christine <yuwei.chen@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; 'Sean Brogan' <sean.brogan@microsoft.com>
> Subject: 回复: [edk2-devel] [Patch] BaseTools: Fix PcdValueInit tool build
> issue with VS compiler x64
>
> Sean and Bob:
> How verify this change?
>
> Thanks
> Liming
> > -----邮件原件-----
> > 发件人: Sean Brogan <spbrogan@outlook.com>
> > 发送时间: 2020年10月17日 6:17
> > 收件人: devel@edk2.groups.io; bob.c.feng@intel.com
> > 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen
> > <yuwei.chen@intel.com>; Michael D Kinney
> <michael.d.kinney@intel.com>;
> > Sean Brogan <sean.brogan@microsoft.com>
> > 主题: Re: [edk2-devel] [Patch] BaseTools: Fix PcdValueInit tool build
> > issue with VS compiler x64
> >
> > Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
> >
> > On 10/15/2020 4:20 AM, Bob Feng wrote:
> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3001
> > >
> > > When the 64-bit version of VS compiler is used, the generated
> > > PcdValueInit tool will be failed to compile.
> > >
> > > This patch is going to fix that issue.
> > >
> > > Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > >
> > > ---
> > > BaseTools/Source/C/Common/PcdValueCommon.h | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/BaseTools/Source/C/Common/PcdValueCommon.h
> > b/BaseTools/Source/C/Common/PcdValueCommon.h
> > > index cfd3bb76e1..1652bd5430 100644
> > > --- a/BaseTools/Source/C/Common/PcdValueCommon.h
> > > +++ b/BaseTools/Source/C/Common/PcdValueCommon.h
> > > @@ -12,11 +12,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> > > #include <Common/UefiBaseTypes.h>
> > > #include <Common/UefiInternalFormRepresentation.h>
> > >
> > > #define __FIELD_SIZE(TYPE, Field) (sizeof((TYPE *)0)->Field)
> > > #define __ARRAY_ELEMENT_SIZE(TYPE, Field) (sizeof((TYPE
> > *)0)->Field[0])
> > > -#define __OFFSET_OF(TYPE, Field) ((UINT32) &(((TYPE *)0)->Field))
> > > +#define __OFFSET_OF(TYPE, Field) ((UINT32)(size_t) &(((TYPE
> > > +*)0)->Field))
> > > #define __FLEXIBLE_SIZE(Size, TYPE, Field, MaxIndex) if
> > (__FIELD_SIZE(TYPE, Field) == 0) Size = MAX((__OFFSET_OF(TYPE, Field)
> > + __ARRAY_ELEMENT_SIZE(TYPE, Field) * (MaxIndex)), Size)
> > > #define __ARRAY_SIZE(Array) (sizeof(Array)/sizeof(Array[0]))
> > >
> > > #if defined(_MSC_EXTENSIONS)
> > > #define __STATIC_ASSERT static_assert
> > >
>
next prev parent reply other threads:[~2020-10-22 1:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 11:20 [Patch] BaseTools: Fix PcdValueInit tool build issue with VS compiler x64 Bob Feng
2020-10-16 22:17 ` [edk2-devel] " Sean
2020-10-19 1:03 ` 回复: " gaoliming
2020-10-19 1:56 ` Bob Feng
2020-10-22 1:04 ` gaoliming [this message]
2020-10-26 3:21 ` Bob Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='008501d6a80f$4b8e2170$e2aa6450$@byosoft.com.cn' \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox