From: "Guomin Jiang" <guomin.jiang@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"rebecca@bsdio.com" <rebecca@bsdio.com>
Cc: "Wang, Jian J" <jian.j.wang@intel.com>,
"Lu, XiaoyuX" <xiaoyux.lu@intel.com>
Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg: Fix VS2017 build problem for ARM/AARCH64
Date: Mon, 25 May 2020 00:57:01 +0000 [thread overview]
Message-ID: <DM6PR11MB29555EC6580959B4D95168DA9DB30@DM6PR11MB2955.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20200520202620.14122-1-rebecca@bsdio.com>
Add comment inline
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca
> Cran
> Sent: Thursday, May 21, 2020 4:26 AM
> To: devel@edk2.groups.io
> Cc: Rebecca Cran <rebecca@bsdio.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Lu, XiaoyuX <xiaoyux.lu@intel.com>
> Subject: [edk2-devel] [PATCH 1/1] CryptoPkg: Fix VS2017 build problem for
> ARM/AARCH64
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2029
>
> 1. CryptPkcs7VerifyEku.c contains internal/x509_int.h header file, this
> file contains internal/refcount.h file, if _M_ARM or _M_ARM64
> defined, it will contains (intrin.h).
> So we undef these flags for MSVC. It will fix include header
> dependence problem(intrin.h).
>
> 2. ARM with MSFT toolchain was not enabled in BuildOptions, So
> add CC_FLAGS for ARM/AARCH64 into OpensslLib[Crypto].inf BuildOptions
> section to fix build problem.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Signed-off-by: Xiaoyu Lu <xiaoyux.lu@intel.com>
> ---
> CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 2 +-
> CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 2 +-
> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 ++
> CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 2 ++
> 4 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> index 4aae2aba95d6..6512f3188499 100644
> --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> @@ -93,7 +93,7 @@ [BuildOptions]
> # suppress the following warnings so we do not break the build with
> warnings-as-errors:
> # C4090: 'function' : different 'const' qualifiers
> #
> - MSFT:*_*_*_CC_FLAGS = /wd4090
> + MSFT:*_*_*_CC_FLAGS = /wd4090 /U_M_ARM /U_M_ARM64
It will have confusion for those who not building for ARM, I suggest that use replace with below
+ MSFT: *_*_ARM_CC_FLAGS = /wd4090 /U_M_ARM /U_M_ARM64
+ MSFT: *_*_AARCH64_CC_FLAGS = /wd4090 /U_M_ARM /U_M_ARM64
>
> # -JCryptoPkg/Include : To disable the use of the system includes provided
> by RVCT
> # --diag_remark=1 : Reduce severity of "#1-D: last line of file ends
> without a newline"
> diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> index dc28e3a11d48..7838b0f3e14b 100644
> --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> @@ -83,7 +83,7 @@ [BuildOptions]
> # C4090: 'function' : different 'const' qualifiers
> # C4718: 'function call' : recursive call has no side effects, deleting
> #
> - MSFT:*_*_*_CC_FLAGS = /wd4090 /wd4718
> + MSFT:*_*_*_CC_FLAGS = /wd4090 /wd4718 /U_M_ARM /U_M_ARM64
It will have confusion for those who not building for ARM, I suggest that use replace with below
+ MSFT: *_*_ARM_CC_FLAGS = /wd4090 /U_M_ARM /U_M_ARM64
+ MSFT: *_*_AARCH64_CC_FLAGS = /wd4090 /U_M_ARM /U_M_ARM64
>
> # -JCryptoPkg/Include : To disable the use of the system includes provided
> by RVCT
> # --diag_remark=1 : Reduce severity of "#1-D: last line of file ends
> without a newline"
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index c8ec9454bd90..c43c7bad4982 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -619,6 +619,8 @@ [BuildOptions]
> #
> MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310
> /wd4389 /wd4700 /wd4702 /wd4706 /wd4819
> MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306
> /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819
> + MSFT:*_*_ARM_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306
> /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819
> + MSFT:*_*_AARCH64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306
> /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819
>
> INTEL:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC
> $(OPENSSL_FLAGS) /w
> INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC
> $(OPENSSL_FLAGS) /w
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> index 2f232e3e1289..594717331f68 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> @@ -568,6 +568,8 @@ [BuildOptions]
> #
> MSFT:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310
> /wd4389 /wd4700 /wd4702 /wd4706 /wd4819
> MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306
> /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819
> + MSFT:*_*_ARM_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306
> /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819
> + MSFT:*_*_AARCH64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306
> /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819
>
> INTEL:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC
> $(OPENSSL_FLAGS) /w
> INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC
> $(OPENSSL_FLAGS) /w
> --
> 2.26.2.windows.1
>
>
>
>
next prev parent reply other threads:[~2020-05-25 0:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 20:26 [PATCH 1/1] CryptoPkg: Fix VS2017 build problem for ARM/AARCH64 Rebecca Cran
2020-05-25 0:57 ` Guomin Jiang [this message]
[not found] <1610D6629CC44D8C.10495@groups.io>
2020-05-20 20:30 ` [edk2-devel] " Rebecca Cran
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=DM6PR11MB29555EC6580959B4D95168DA9DB30@DM6PR11MB2955.namprd11.prod.outlook.com \
--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