From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.24095.1590368225412677142 for ; Sun, 24 May 2020 17:57:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=vpO3103a; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: guomin.jiang@intel.com) IronPort-SDR: 0JasKXKrM2qf+NiTIEiABkfNbFinKm6Z5VBAbzmcbHxZ9VF0LQQHXP21JkEch1+vi6E3zdhpv9 xL3paJl/cUfg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2020 17:57:04 -0700 IronPort-SDR: rAC8o5JooaSpoKs9capdwEm+qOzpnr0cbSfiXlYIrQhKcFprn+X9sNNcKrBYlRC9Rn1ott0QWN tjrZtZLnInbQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,431,1583222400"; d="scan'208";a="283983374" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by orsmga002.jf.intel.com with ESMTP; 24 May 2020 17:57:04 -0700 Received: from orsmsx111.amr.corp.intel.com (10.22.240.12) by ORSMSX106.amr.corp.intel.com (10.22.225.133) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 24 May 2020 17:57:03 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX111.amr.corp.intel.com (10.22.240.12) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 24 May 2020 17:57:03 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.104) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 24 May 2020 17:57:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GzLFjagmSVBqKgm4EAk6ITSmzLur5DkmdVtqtRuluHQfCHgs1pPoW9UBn9wJbkvZ9JPaGWV4bUqb5/Ro5Pfii2dAvdzVnAtxY0PMKEJ6Lw/ZwB8vCR/+xavdCDfzdjQe3YrFfZ6ZQYcQtekfxYdNtlXsQOirfG5Q3JJJRZ/Fxqe6WPpC/1ukys+S7rD9GBQ0syhXoI65oWFiKTJs8gA6wUDw6++KE1YkGpPYNN8Huq1AHrHFcXkclbJ54BNftDHKaaX7LPQy/cDCgnHTQjSoHdauqTlyi2vzLm6VGuaHVuu8b+2uSM7zIHDPcZTc71KvLBh71PYp7GGtdJbwXFxNNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sPf5VBVVK9DA/o8wz7Hg8gpNk/TOybF7lT12aRq5aWs=; b=RXsgrq7sF2smPsz2NX0Vnk+VO/nf1vupk0SUhrs6zn5ATVB4LPOlrX+Y4x+k7/oWzO+H3gSEvsDGAoZ+jPGo5oJnxO7vkOWubTxqDVBbbRMSkWSvklPDtOji1OC44CMNUxwLhwLNj1gs0Z3XqhTogz8LqkYmmhYnt8JOIbvMTkDOMxu6twnmVKYt/4u6HWlo7Ke4fF8nM1woad3Kc7KJC1bAvebKi4O+0sE5AORW8bPlfzrUE86Bz30IYLoNpNi2BDZO0R3yiAUU3l6WfJtBulV4dX/XHnhIyZgE8NDD/tfv2m/wZh5s+OvOKCwBv4CT4d8+7Gq1GSgMEB/T/joYVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sPf5VBVVK9DA/o8wz7Hg8gpNk/TOybF7lT12aRq5aWs=; b=vpO3103aYtxZD2XmHuqY8vcvzyLtlavZuGTr+PbMFYrkl7solVJo/jWfrdPCYCxwYCFqmNKUaz0JCmBSMPVVTuT0hRtkTfKmoS2mjcd0jFGDCvjsBQJaxBb0VbwEFK5AzsQkzj4FRoToOOun2HelkSAglJ13QA2otVMRVi/yds4= Received: from DM6PR11MB2955.namprd11.prod.outlook.com (2603:10b6:5:65::31) by DM6PR11MB4595.namprd11.prod.outlook.com (2603:10b6:5:2ac::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27; Mon, 25 May 2020 00:57:02 +0000 Received: from DM6PR11MB2955.namprd11.prod.outlook.com ([fe80::ccd4:4b0d:535a:58be]) by DM6PR11MB2955.namprd11.prod.outlook.com ([fe80::ccd4:4b0d:535a:58be%7]) with mapi id 15.20.3021.029; Mon, 25 May 2020 00:57:02 +0000 From: "Guomin Jiang" To: "devel@edk2.groups.io" , "rebecca@bsdio.com" CC: "Wang, Jian J" , "Lu, XiaoyuX" Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg: Fix VS2017 build problem for ARM/AARCH64 Thread-Topic: [edk2-devel] [PATCH 1/1] CryptoPkg: Fix VS2017 build problem for ARM/AARCH64 Thread-Index: AQHWLuUCiqJF6PKH5kaYplk9v2rEo6i3/+kA Date: Mon, 25 May 2020 00:57:01 +0000 Message-ID: References: <20200520202620.14122-1-rebecca@bsdio.com> In-Reply-To: <20200520202620.14122-1-rebecca@bsdio.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.196] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9d0f9d3e-7b3c-463e-16d3-08d800468926 x-ms-traffictypediagnostic: DM6PR11MB4595: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3513; x-forefront-prvs: 0414DF926F x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uWUUeG3NpHyVxlWyI+jWITyvR445f6pw/Tvu15fUEkPkQZQfttOpi0z6GMcJsld4bkkXskdXeWr+CAWyOg1slBtrf8MKrQhQbupLsseZVT0a4hK8ymFWM1/zCg1GSwRDXszY4FosrHjazsJDvV8j7EE8/cU9B4H6NUUh8gv8xcxYQzgD8rLAeIlclqChyyA71KZkgEZ8PG9Bk5qZH31TgIFRBiypg3o/ZuGOaekmwC6WGqkA9Dnb0t8fwDD8bkx1cyK9ZhSC0XM9pEmYDfwtjZo67SiSHCEyaHIL9uT8CjFfrsbMtCJmZa7nkPsUI9TkRGwLRF0NgpwD6m16/YLrn/SKm9VqKinrzrOVKZlmMWy2Zluu+itqOJMq0Z8JUNL6ctqPyQ1H4xsm3i5+DUUa56aXgPDNVEJKLtSwHLjsXtJYIdxjfWdL4F08gxZbILJnIVSWAzJCT4dmnWbaMyR+KsLQT3+7+WjWGduo2+SsHao= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB2955.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(346002)(366004)(39860400002)(376002)(136003)(8676002)(186003)(71200400001)(52536014)(55016002)(19627235002)(9686003)(33656002)(66946007)(66556008)(4326008)(478600001)(66476007)(66446008)(76116006)(64756008)(2906002)(86362001)(54906003)(110136005)(316002)(53546011)(5660300002)(107886003)(6506007)(8936002)(966005)(26005)(7696005)(3714002)(545624004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 6NKSSvVTkMRDpwjLILCWz10EeJ3Qg/QgiCPnU5SSt4uctLtPIQfpE2PXRpaziijm6fZhIYwp4OWz7lLUyGBVc3wZs3pn+00JDnugMUNYYEO3bUQz02Lnlqu918jBdrqndSkN9ZmOfOj80o/GA9TZoUi1Be7AXJR4voAhhuKsZhF6gaOF09uyp0FmL8AxMj1vjIAVMZPpSUISqBnP9/UEc3mHGch3RlSBYSia705ypxP5KpaG10CnwFHID/8FKEfyGvJx5mXd4+JgxWBy/DB32YbKiMka3MTsPdH3dht+R0wXesUvtDPMYLjMSXDrYKs4M3xxR7AQadfo1TE7NmFCQQulW2y+lXcSy2ghQd4zuLZfm04E1TrDYZQBpUV2ABoYAs/Bp8+bwa/g8MziwVu5ztTBiJx+Fw2Ls6MiTCtpVlbUzF2rRg33NsKMc0ZBma2HGTG9zulzdanbQnedrbi8fk6ybSaeXKUGU/p6w5ISKI4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 9d0f9d3e-7b3c-463e-16d3-08d800468926 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 May 2020 00:57:01.9561 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: h4dbbyEy+HtfFKdM/d4UpNPOEt19/wFvOO32c44txPhFt233rhU4DomNr8rATLygn6VOyPtwfuSiYbF2CrbspQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4595 Return-Path: guomin.jiang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Add comment inline > -----Original Message----- > From: 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 ; Wang, Jian J > ; Lu, XiaoyuX > Subject: [edk2-devel] [PATCH 1/1] CryptoPkg: Fix VS2017 build problem fo= r > ARM/AARCH64 >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2029 >=20 > 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). >=20 > 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. >=20 > Cc: Jian J Wang > Signed-off-by: Xiaoyu Lu > --- > 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(-) >=20 > 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 =3D /wd4090 > + MSFT:*_*_*_CC_FLAGS =3D /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 =3D /wd4090 /U_M_ARM /U_M_ARM64 + MSFT: *_*_AARCH64_CC_FLAGS =3D /wd4090 /U_M_ARM /U_M_ARM64 >=20 > # -JCryptoPkg/Include : To disable the use of the system includes pro= vided > by RVCT > # --diag_remark=3D1 : 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, deleti= ng > # > - MSFT:*_*_*_CC_FLAGS =3D /wd4090 /wd4718 > + MSFT:*_*_*_CC_FLAGS =3D /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 =3D /wd4090 /U_M_ARM /U_M_ARM64 + MSFT: *_*_AARCH64_CC_FLAGS =3D /wd4090 /U_M_ARM /U_M_ARM64 >=20 > # -JCryptoPkg/Include : To disable the use of the system includes pro= vided > by RVCT > # --diag_remark=3D1 : 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 =3D -U_WIN32 -U_WIN64 -U_MSC_VER > $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310 > /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 > MSFT:*_*_X64_CC_FLAGS =3D -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 =3D -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 =3D -U_WIN32 -U_WIN64 -U_MSC_VER > $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306 > /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 >=20 > INTEL:*_*_IA32_CC_FLAGS =3D -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC > $(OPENSSL_FLAGS) /w > INTEL:*_*_X64_CC_FLAGS =3D -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 =3D -U_WIN32 -U_WIN64 -U_MSC_VER > $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310 > /wd4389 /wd4700 /wd4702 /wd4706 /wd4819 > MSFT:*_*_X64_CC_FLAGS =3D -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 =3D -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 =3D -U_WIN32 -U_WIN64 -U_MSC_VER > $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306 > /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819 >=20 > INTEL:*_*_IA32_CC_FLAGS =3D -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC > $(OPENSSL_FLAGS) /w > INTEL:*_*_X64_CC_FLAGS =3D -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC > $(OPENSSL_FLAGS) /w > -- > 2.26.2.windows.1 >=20 >=20 >=20 >=20