From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.6446.1654747044550859614 for ; Wed, 08 Jun 2022 20:57:24 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=fOkfs1Nf; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654747044; x=1686283044; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=EpuPJJ3l0qtg7nCU6NUl8cfFY1YQgry/GmNHwScktVM=; b=fOkfs1NfOEysnUKyKJP+98ZSrf0KcH8FZMS7J8UYvmtb+ZuREzlZsld2 MeBmCNfLLEyyeu2QMOZlqaDBtbdS6IrI669DLXxQ/DRLUYc5FEkKywUCU EmyfGMDTGmXjrtqUP9SpYhcRZYD6LsQwt9h46m4y6AqPMphPH8MsRMmtO c5uMEEGXhPBcflyR1qcDbJBwK09HGdQYf4roImvqnN9Pohk3Qt0gAq5P6 w5Ur4XhTz7Du62sZ6JnHvdM/Bw0rziyaJVTtEcQ9u/YXwuruF5HtV541n IF57wOPDwQ5t6A6qsO3ypES9/WqwdwKOjFAZVdYDHIJU+UFP3prPAZUak g==; X-IronPort-AV: E=McAfee;i="6400,9594,10372"; a="257566920" X-IronPort-AV: E=Sophos;i="5.91,287,1647327600"; d="scan'208";a="257566920" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2022 20:57:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,287,1647327600"; d="scan'208";a="908054490" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga005.fm.intel.com with ESMTP; 08 Jun 2022 20:57:22 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Wed, 8 Jun 2022 20:57:21 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Wed, 8 Jun 2022 20:57:21 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.177) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Wed, 8 Jun 2022 20:57:21 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HBq/+w8j6MMlxv2o0sBYeBlH8xkw16FYYQ7T08CBaqFd8ZuYlZTeaKwfodjd6AUBsMoGtGp+uRh3OYrywwuYJqMCMPaKcqYIP8vNFX9VfywJ9Ic2vW9tcv1DYnqN9HNNgj3TWcHgDaUT6ti3CAfd/vzfeKKCCxgMgImxsrJS2WmiGdqjjyvYeRBrf/IO63JExsf/tH94haKEbghuR5xicoh6cDHWDpsJNtkVB92b3dXzOD97eHhy9nAD0YD0myVXOTi/vEZUVz+UwpNPZ0KIRb1G43EwpjjXx71arGkBFnTC3OnERGoNrVQz18V5iGbHUVO2JmQkyHf0/nw4WrotVg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PWN/AK6+WYWEdKtQoDdkb3oMONqjjUnkMhWjaroq/UM=; b=at1u5aC7dcKVmsSWCHjn6qxd9pPL3VW9Ee4KTWyUC+biBHvZQSSWJOPyBFPJGyThKPwP+IIWYO/+ztgB3AQ8z4AZCUIkGZhZEpOAb+M6EEwaSzZZefignWiM6RlUdGzALM4qKr3pFFlFmG4/HWWSzTS7aTr1LPGCA3VTIJpNhejL4p1NMwS+k/CxLnbLhnrk9szI4aG4tArvlFJlIMGBIJuxbbgfy5TSZLGA0qH+a9l2/E2BtP/c+28GEz40XdKjAooT8OpFUAOKFAf2NWcfK1mJY9taC1hif3yD5CxTQLajm2HzgmXGS+/0mH3ly9VVklv6vAmZKGwPqqhAH5OLUg== 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 Received: from MWHPR11MB1631.namprd11.prod.outlook.com (2603:10b6:301:10::10) by DM5PR11MB1833.namprd11.prod.outlook.com (2603:10b6:3:110::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Thu, 9 Jun 2022 03:57:16 +0000 Received: from MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::4501:93e1:b65d:684c]) by MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::4501:93e1:b65d:684c%11]) with mapi id 15.20.5314.019; Thu, 9 Jun 2022 03:57:16 +0000 From: "Ni, Ray" To: Gerd Hoffmann , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Wu, Jiaxin" , Sean Brogan , "Anthony Perard" , Leif Lindholm , "Liu, Zhiguang" , "Lu, Xiaoyu1" , Pawel Polawski , "Sami Mujawar" , Maciej Rabeda , "Feng, Bob C" , "Yao, Jiewen" , Andrew Fish , Bret Barkelew , Alexei Fedorov , "Dong, Guo" , "kilian_kegel@hotmail.com" , Maurice Ma , Siyuan Fu , "Chang, Abner" , "Gao, Zhichao" , "Xu, Wei6" , Supreeth Venkatesh , Julien Grall , "Schaefer, Daniel" , Ard Biesheuvel , "Jiang, Guomin" , "Justen, Jordan L" , Oliver Steffen , "Boeuf, Sebastien" , "You, Benjamin" , "Xu, Min M" , Rebecca Cran , "Wang, Nickle" , "Kinney, Michael D" , Tom Lendacky , Sami Mujawar , Peter Grehan , "Aktas, Erdem" , Brijesh Singh , James Bottomley , "Chen, Christine" , "Gao, Liming" , "Yao, Jiewen" , Ard Biesheuvel Subject: Re: [PATCH v4 4/9] MdePkg/CompilerIntrinsicsLib: move ia32 intrinsics and strcmp Thread-Topic: [PATCH v4 4/9] MdePkg/CompilerIntrinsicsLib: move ia32 intrinsics and strcmp Thread-Index: AQHYd0VCleP+6Se+4kGHDSZHDsXLoq1Ge0Zw Date: Thu, 9 Jun 2022 03:57:16 +0000 Message-ID: References: <20220603122638.1547060-1-kraxel@redhat.com> <20220603122638.1547060-5-kraxel@redhat.com> In-Reply-To: <20220603122638.1547060-5-kraxel@redhat.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ba140f1f-7c96-45da-83c2-08da49cc2488 x-ms-traffictypediagnostic: DM5PR11MB1833:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7M0hFQxbiux2rRhcn68QeDrYp/d44ydpMw58suvXt1qEeBmZNX7O4KrBsk4xLe1Hh+RtZxsVqVDz5N7jkDNVazJDhrwo3ouVsHyib1gq5hZ0XmIVhANdgSNBtePse2xrxm3+557vP4RIAfNw/GdW+FqdwALJoYCnTZFBO0+frqvt48k83IgMfoWtgapL1FggCetnYHHBRwMOvh7j15AigwgD1YfaG7b5KV/BjeD/z8/SAnUWOTElMdfHSRTamYH49OiRWmUb2CO9XMcamGXS12kuEAfig+oFIuMGudkXUWDlu8110SNX0xLkAXAXMMxeaXPhkwtwlZ6Tsd8k7l9uVwwt6O6MRnWK04c453r4hMJn/vjJ6ZxJ8b5bvX2Dfvsywo2RJ5oWLAKI7QL3MXq7al9uxWt9YG27/SRLqbQOuDaxLQr2+1VYRjz9WTRUYFyg8dkKEQGsZw7j7CflIF3/o46Er6pLntYPdFq0e+EybIhhznl2Bx5mWQV8Hm+0aIGBI/WvNjMsrU7HRZiOHdforHIAFyMlv965n29A68t6W3Xrz+BrC0TBaoxEF6k2l9FWS7a4ZWZEtirG/Y/ur8ihQTv+mkAp8WnubBsn0XjzQhdjm+Kz8ry8qlWv6R/kU3OKXLU3BXI/hQjz+/QQxH9C3WQnQw3fFrytfQIfYvJsMPTRIz1tobpKdnDwCOiidn56XIN+Ahl/bTHHGZrqcGV8zbO/VUL4xNqH+f/yspHsAhvLLVBcL9ouT2TKu73rfSvPchMIEoIfmKWr0wkAwPXxsfNXuKD+lYiBLj4kErk7Uvw= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1631.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(55016003)(2906002)(316002)(7696005)(64756008)(66446008)(38070700005)(110136005)(76116006)(66946007)(122000001)(26005)(9686003)(53546011)(8676002)(4326008)(66476007)(82960400001)(66556008)(186003)(5660300002)(6506007)(54906003)(38100700002)(7416002)(30864003)(86362001)(508600001)(8936002)(45080400002)(52536014)(71200400001)(19627235002)(33656002)(83380400001)(545624005)(17423001)(156123004)(579004)(559001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?alQsT85YJfts2EUG7doUqU+J9LKfyQsx1bJCU1HJLY55vyHGdajh8AOsqwzw?= =?us-ascii?Q?zUfbL8hbjQz7L5lBe1mSCK/IJqKkdsWaCy3lCucRHf5qPISkZdihv5CLcoCO?= =?us-ascii?Q?xFaNZ5QYFWEGCV2M4uDKn+ekmoXuYWorBDx3V0drAn1HDTeXlkze8hhj61iQ?= =?us-ascii?Q?AI2birppAbyAiwtUMte0ZjelHMN9IbbYa1Vs01GIZNSXQ+vQSG8J4tcU4Vtv?= =?us-ascii?Q?4vaczvrzzHzTShlgWtP7GvQK9vZlYyJN0DBXoqSCSPZhWexdYKNgEMMzlDTF?= =?us-ascii?Q?Vvprd9Kx7rLLAeER9XMQtJw8DVgFpQxS2UHKDgWrMsX0Yxlqa7DE262WkB1/?= =?us-ascii?Q?vY59uwiqg1+dPQiArxX5phIHtNLY/uSBBWmLIjMdLCbElcE4dbv5QHXWSg8F?= =?us-ascii?Q?Ouwan7VKZJ4pFXJPRDvzECoOI8Q3ryrUHuTmMVJ8ne7y2Q9MmPSVXLPM3qzR?= =?us-ascii?Q?XgBtAm6rsWVQlcsvyjJCmsInsXlFqBu9qe+gpbjZ1il6ZyGFdfFCoPF7s5k0?= =?us-ascii?Q?+IRtc9qGjwx1Y39/76gy+1lQ5MvNQffjies0HwGcAMNlNCh71ZG4DIWhdR9U?= =?us-ascii?Q?XbT9TNhEr2YQPq/n4Z5xOVY7UZ6+Fm3WES1gfip1B+JTiUd7kD8Wz5fkKLnz?= =?us-ascii?Q?mwFDzynHJEsfwy5OrhPO9xiTqVKmq75cZLDEpWrv1jyjahGp6xuoPOBEXlIi?= =?us-ascii?Q?qjngn0W9nty0pNoEUvwKKzQ2Q0I3zQZXKSki0EKz1amShQeCdhzxSuh+Bkb4?= =?us-ascii?Q?dDOX4UzzYA0snoHp/XVeDh6XZl192J+B5F7XUWxrHU4f+1/IpWr2HVeM1PRD?= =?us-ascii?Q?1zuVycRRnmcso2gZlz3csVYyLXIr6SfUAPOuoUjGkhAQWFTlSIPQr2Ol7L/q?= =?us-ascii?Q?cQ0go4+E92ypfzQ7hENWFJOGg9g97/eL6aecRSOQrLFkLcPX4zlyQZwKOMzq?= =?us-ascii?Q?8s2hC0qd8vC6A0vIVgOM7g+Fbko2qCWbZG++dW1bEcB24UQtgB3D5j9kjQYm?= =?us-ascii?Q?YxZxVMe/Szwhi6zxLLHEFPYhPbwAnuyWnSKyXop0hd7VkkPidXgQMUz9BoTQ?= =?us-ascii?Q?ZveAEElnwTFz/y+PLWaTGkIjstMJ2GBeYulO4xEhRUdmTicfAoeruK5YZf51?= =?us-ascii?Q?gqxL0wAVey0nJMmqadcrCYNre/aowKXsEoDjVBIcn2ep6LKPYnBJfC2cIpgP?= =?us-ascii?Q?NiInlEaR+0bZ00RigRYtrzusg/kbDNPriH6zCyR5MGL7OjwriXdzlt6sLKTb?= =?us-ascii?Q?+CZ9lqP/7kYS6C0/1YtxC+7MnxJGrpdHtHl2wHwiqGwTPkV2a8qrkO2fZMjT?= =?us-ascii?Q?YCHHaoNXYLhX2+nMZLQpba/Ikx9ZWrddQ2mG17i5JejwXbDnUnE8UgXSIAMs?= =?us-ascii?Q?qEik6diNGFFAXNClqX3uYX0ldUPAmVKfe7O+vdLpMXv2smtTk2om7+MMVDhh?= =?us-ascii?Q?zzg0n8GensWMOLmZaUOO7RzCdMKD6Yjc3TUeYSW2zDFcH/oe2NIZKzClJCWD?= =?us-ascii?Q?X45q/jTu8kTlG0gmubX8E0KniHMG2OrjmRZrShG/whjc13335UaFDhVLGSMT?= =?us-ascii?Q?G5EHTd4H5vQaWZp+6RMKYc9owkWhV/9fJkfzrCb5J2MO0ym/PxWQd/9gBAB1?= =?us-ascii?Q?NdhERHdJefzXpUOyPjrrfNWqXRafR3D66VFEuzvqgmyheroqZRCgql864ztp?= =?us-ascii?Q?Kjzse0zGiascwRvuWAEq9vnnJy0/oNbqNWYub4+X0hRj8L+Dt4/yXObBWZks?= =?us-ascii?Q?udHxsPQLlg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1631.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba140f1f-7c96-45da-83c2-08da49cc2488 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2022 03:57:16.1272 (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: MfnIxTJ+cgYKkZwwFMPW3i4uNRz28p4jeYulsEDMGGJD01gxu78THh32CrsiS/jNwR8cJl0H3LECgPGI1fABdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1833 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Gerd, I am interested in this patch sets. But I have some trouble to get all the = patches. Do you have a branch that contains all the changes? Thanks, Ray > -----Original Message----- > From: Gerd Hoffmann > Sent: Friday, June 3, 2022 8:27 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Wu, Jiaxin ; Sean Brogan ; > Anthony Perard ; Leif Lindholm ; Liu, Zhiguang > ; Lu, Xiaoyu1 ; Pawel Polaw= ski ; Sami Mujawar > ; Maciej Rabeda ; Fe= ng, Bob C ; Yao, > Jiewen ; Andrew Fish ; Bret Barkel= ew ; Alexei > Fedorov ; Dong, Guo ; Gerd Ho= ffmann ; > kilian_kegel@hotmail.com; Maurice Ma ; Siyuan Fu ; Chang, Abner > ; Gao, Zhichao ; Xu, Wei6 ; Supreeth Venkatesh > ; Julien Grall ; Schaefer, Da= niel ; Ard Biesheuvel > ; Jiang, Guomin ; Just= en, Jordan L ; Oliver > Steffen ; Boeuf, Sebastien ; You, Benjamin ; > Xu, Min M ; Ni, Ray ; Rebecca Cran = ; Wang, Nickle > ; Kinney, Michael D ; To= m Lendacky ; > Sami Mujawar ; Peter Grehan ; A= ktas, Erdem ; > Brijesh Singh ; James Bottomley ; Chen, Christine ; > Gao, Liming ; Yao, Jiewen ; Ard Biesheuvel > Subject: [PATCH v4 4/9] MdePkg/CompilerIntrinsicsLib: move ia32 intrinsic= s and strcmp >=20 > Move intrinsics for ia32 from CryptoPkg/Library/IntrinsicLib > to MdePkg/Library/CompilerIntrinsicsLib. Also move strcmp. >=20 > Remove CryptoPkg/Library/IntrinsicLib. > Use MdePkg/Library/CompilerIntrinsicsLib instead. > Update all references. >=20 > Signed-off-by: Gerd Hoffmann > Acked-by: Jiewen Yao > Acked-by: Ard Biesheuvel > Acked-by: Liming Gao > --- > ArmVirtPkg/ArmVirt.dsc.inc | 2 +- > CryptoPkg/CryptoPkg.dsc | 3 +- > EmulatorPkg/EmulatorPkg.dsc | 2 +- > FmpDevicePkg/FmpDevicePkg.dsc | 2 +- > NetworkPkg/NetworkPkg.dsc | 2 +- > OvmfPkg/AmdSev/AmdSevX64.dsc | 2 +- > OvmfPkg/Bhyve/BhyveX64.dsc | 2 +- > OvmfPkg/CloudHv/CloudHvX64.dsc | 2 +- > OvmfPkg/IntelTdx/IntelTdxX64.dsc | 2 +- > OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- > OvmfPkg/OvmfPkgIa32.dsc | 2 +- > OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- > OvmfPkg/OvmfPkgX64.dsc | 2 +- > OvmfPkg/OvmfXen.dsc | 2 +- > SecurityPkg/SecurityPkg.dsc | 10 +-- > SignedCapsulePkg/SignedCapsulePkg.dsc | 12 +-- > UefiPayloadPkg/UefiPayloadPkg.dsc | 2 +- > .../Library/IntrinsicLib/IntrinsicLib.inf | 69 ----------------- > .../CompilerIntrinsicsLib.inf | 16 ++++ > CryptoPkg/Library/IntrinsicLib/CopyMem.c | 47 ------------ > .../Library/IntrinsicLib/MemoryIntrinsics.c | 74 ------------------- > .../CompilerIntrinsicsLib}/Ia32/MathFtol.c | 0 > .../Ia32/MathLShiftS64.c | 0 > .../Ia32/MathRShiftU64.c | 0 > MdePkg/Library/CompilerIntrinsicsLib/strcmp.c | 33 +++++++++ > .../Library/IntrinsicLib/BaseIntrinsicLib.uni | 16 ---- > .../Ia32/MathLShiftS64.nasm | 0 > .../CompilerIntrinsicsLib}/Ia32/MathLlmul.asm | 0 > .../CompilerIntrinsicsLib}/Ia32/MathLlshr.asm | 0 > .../Ia32/MathRShiftU64.nasm | 0 > 30 files changed, 75 insertions(+), 233 deletions(-) > delete mode 100644 CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > delete mode 100644 CryptoPkg/Library/IntrinsicLib/CopyMem.c > delete mode 100644 CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c > rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntri= nsicsLib}/Ia32/MathFtol.c (100%) > rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntri= nsicsLib}/Ia32/MathLShiftS64.c (100%) > rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntri= nsicsLib}/Ia32/MathRShiftU64.c (100%) > create mode 100644 MdePkg/Library/CompilerIntrinsicsLib/strcmp.c > delete mode 100644 CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni > rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntri= nsicsLib}/Ia32/MathLShiftS64.nasm (100%) > rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntri= nsicsLib}/Ia32/MathLlmul.asm (100%) > rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntri= nsicsLib}/Ia32/MathLlshr.asm (100%) > rename {CryptoPkg/Library/IntrinsicLib =3D> MdePkg/Library/CompilerIntri= nsicsLib}/Ia32/MathRShiftU64.nasm (100%) >=20 > diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc > index 4b5687927ae8..cc960cf103d2 100644 > --- a/ArmVirtPkg/ArmVirt.dsc.inc > +++ b/ArmVirtPkg/ArmVirt.dsc.inc > @@ -153,7 +153,7 @@ [LibraryClasses.common] > # > # CryptoPkg libraries needed by multiple firmware features > # > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc > index 71679687a8b1..4db8de2e5de8 100644 > --- a/CryptoPkg/CryptoPkg.dsc > +++ b/CryptoPkg/CryptoPkg.dsc > @@ -103,7 +103,7 @@ [LibraryClasses] > UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib= /UefiRuntimeServicesTableLib.inf #??? > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf = #??? > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf >=20 > [LibraryClasses.ARM] > @@ -240,7 +240,6 @@ [Components] > CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > - CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > CryptoPkg/Library/TlsLib/TlsLib.inf > CryptoPkg/Library/TlsLibNull/TlsLibNull.inf > CryptoPkg/Library/OpensslLib/OpensslLib.inf > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index 4cf886b9eac7..e460e925a988 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -129,7 +129,7 @@ [LibraryClasses] >=20 > !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSe= cureLibNull.inf > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.in= f > diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.ds= c > index 258b5ce0cded..f314548d4066 100644 > --- a/FmpDevicePkg/FmpDevicePkg.dsc > +++ b/FmpDevicePkg/FmpDevicePkg.dsc > @@ -57,7 +57,7 @@ [LibraryClasses] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > RngLib|MdePkg/Library/BaseRngLibNull/BaseRngLibNull.inf > diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc > index f69eb3d1d5c2..95dedad392fb 100644 > --- a/NetworkPkg/NetworkPkg.dsc > +++ b/NetworkPkg/NetworkPkg.dsc > @@ -53,7 +53,7 @@ [LibraryClasses] > !else > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > !endif > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf > diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc > index fc1fdb2e2297..c0bcc14c6ee6 100644 > --- a/OvmfPkg/AmdSev/AmdSevX64.dsc > +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc > @@ -188,7 +188,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf >=20 > diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc > index f0166e136cd1..e7b38222ebd6 100644 > --- a/OvmfPkg/Bhyve/BhyveX64.dsc > +++ b/OvmfPkg/Bhyve/BhyveX64.dsc > @@ -187,7 +187,7 @@ [LibraryClasses] > IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.= dsc > index 92664f319be2..f1d1a1e946b2 100644 > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc > @@ -198,7 +198,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdx= X64.dsc > index dd8d446f4a56..daeb7cb27cbe 100644 > --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc > +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc > @@ -175,7 +175,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf >=20 > diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.= dsc > index f8fc977cb205..edaec5995f0e 100644 > --- a/OvmfPkg/Microvm/MicrovmX64.dsc > +++ b/OvmfPkg/Microvm/MicrovmX64.dsc > @@ -195,7 +195,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index a9841cbfc3ca..0abcbf2c2143 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -195,7 +195,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index f7949780fa38..8c072eac5d4c 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -199,7 +199,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 1448f925b782..212bdab722d5 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -215,7 +215,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc > index 6ba4bd729ae7..ad88ede14b26 100644 > --- a/OvmfPkg/OvmfXen.dsc > +++ b/OvmfPkg/OvmfXen.dsc > @@ -184,7 +184,7 @@ [LibraryClasses] > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf >=20 > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > !else > diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc > index 2b5ef67016b8..b71b78f56ca5 100644 > --- a/SecurityPkg/SecurityPkg.dsc > +++ b/SecurityPkg/SecurityPkg.dsc > @@ -101,7 +101,7 @@ [LibraryClasses.common.PEIM] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > !endif > @@ -119,7 +119,7 @@ [LibraryClasses.common.DXE_DRIVER] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > !endif > @@ -140,7 +140,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > !endif > @@ -152,7 +152,7 @@ [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.co= mmon.UEFI_APPLICATION] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > !endif > @@ -171,7 +171,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > !endif > diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/Sig= nedCapsulePkg.dsc > index 72b533cd04e8..213e165be5d0 100644 > --- a/SignedCapsulePkg/SignedCapsulePkg.dsc > +++ b/SignedCapsulePkg/SignedCapsulePkg.dsc > @@ -126,7 +126,7 @@ [LibraryClasses.common.PEIM] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > !endif > @@ -141,7 +141,7 @@ [LibraryClasses.common.DXE_DRIVER] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > !endif > @@ -155,7 +155,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf > !endif > @@ -178,7 +178,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > !endif > @@ -190,7 +190,7 @@ [LibraryClasses.common.UEFI_DRIVER] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > !endif > @@ -202,7 +202,7 @@ [LibraryClasses.common.UEFI_APPLICATION] > !ifdef CONTINUOUS_INTEGRATION > BaseCryptLib|CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf > !else > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > !endif > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPaylo= adPkg.dsc > index 4d9bbc80c866..3f20d691fc6e 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -182,7 +182,7 @@ [LibraryClasses] > DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLi= b.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf > HobLib|UefiPayloadPkg/Library/DxeHobLib/DxeHobLib.inf > diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/= Library/IntrinsicLib/IntrinsicLib.inf > deleted file mode 100644 > index 86e74b57b109..000000000000 > --- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > +++ /dev/null > @@ -1,69 +0,0 @@ > -## @file > -# Intrinsic Routines Wrapper Library Instance. > -# > -# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved. > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > -## > - > -[Defines] > - INF_VERSION =3D 0x00010005 > - BASE_NAME =3D BaseIntrinsicLib > - MODULE_UNI_FILE =3D BaseIntrinsicLib.uni > - FILE_GUID =3D 63850097-3E97-4c4f-A52D-C811A010610= 5 > - MODULE_TYPE =3D BASE > - VERSION_STRING =3D 1.0 > - LIBRARY_CLASS =3D IntrinsicLib > - > -# > -# The following information is for reference only and not required by th= e build tools. > -# > -# VALID_ARCHITECTURES =3D IA32 X64 > -# > - > -[Sources] > - MemoryIntrinsics.c > - > -[Sources.IA32] > - CopyMem.c > - > - Ia32/MathLShiftS64.c | MSFT > - Ia32/MathRShiftU64.c | MSFT > - Ia32/MathFtol.c | MSFT > - Ia32/MathLlmul.asm | MSFT > - Ia32/MathLlshr.asm | MSFT > - > - Ia32/MathLShiftS64.c | INTEL > - Ia32/MathRShiftU64.c | INTEL > - Ia32/MathFtol.c | INTEL > - > - Ia32/MathLShiftS64.nasm | GCC > - Ia32/MathRShiftU64.nasm | GCC > - > -[Sources.X64] > - CopyMem.c > - > -[Packages] > - MdePkg/MdePkg.dec > - > -[LibraryClasses] > - BaseLib > - BaseMemoryLib > - > -[BuildOptions] > - # > - # Override MSFT build option to remove /Oi and /GL > - # > - MSFT:DEBUG_VS2003_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs3= 2768 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- > /GR- /GF /GX- /Zi /Gm > - MSFT:RELEASE_VS2003_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs3= 2768 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- > /GR- /GF /GX- > - MSFT:DEBUG_VS2003xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs3= 2768 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- > /GR- /GF /GX- /Zi /Gm > - MSFT:RELEASE_VS2003xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /W4 /Gs3= 2768 /Gy /D UNICODE /O1b2 /FIAutoGen.h /EHs- > c- /GR- /GF /GX- > - MSFT:DEBUG_DDK3790_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs3= 2768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- > /GF /Zi /Gm > - MSFT:RELEASE_DDK3790_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs3= 2768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- /GR- > /GF > - MSFT:DEBUG_DDK3790xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs3= 2768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- > /GR- /GF /Zi /Gm > - MSFT:RELEASE_DDK3790xASL_IA32_CC_FLAGS =3D=3D /nologo /c /WX /Gy /Gs3= 2768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- > /GR- /GF > - MSFT:DEBUG_*_IA32_CC_FLAGS =3D=3D /nologo /c /WX /GS- /W4= /Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- > /GR- /GF /Gy /Zi /Gm > - MSFT:RELEASE_*_IA32_CC_FLAGS =3D=3D /nologo /c /WX /GS- /W4= /Gs32768 /D UNICODE /O1b2 /FIAutoGen.h /EHs-c- > /GR- /GF > - MSFT:DEBUG_*_X64_CC_FLAGS =3D=3D /nologo /c /WX /GS- /X = /W4 /Gs32768 /D UNICODE /O1b2s /Gy /FIAutoGen.h > /EHs-c- /GR- /GF /Zi /Gm > - MSFT:RELEASE_*_X64_CC_FLAGS =3D=3D /nologo /c /WX /GS- /X = /W4 /Gs32768 /D UNICODE /O1b2s /Gy /FIAutoGen.h > /EHs-c- /GR- /GF > - INTEL:*_*_*_CC_FLAGS =3D /Oi- > diff --git a/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.i= nf > b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > index a1559fc40ce9..7267d0e3154d 100644 > --- a/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > +++ b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > @@ -26,6 +26,8 @@ [Sources] > memcmp_ms.c | MSFT > memmove_ms.c | MSFT >=20 > + strcmp.c > + > [Sources.ARM] > Arm/ashrdi3.S | GCC > Arm/ashldi3.S | GCC > @@ -67,6 +69,20 @@ [Sources.ARM] > [Sources.AARCH64] > AArch64/Atomics.S | GCC >=20 > +[Sources.IA32] > + Ia32/MathLShiftS64.c | MSFT > + Ia32/MathRShiftU64.c | MSFT > + Ia32/MathFtol.c | MSFT > + Ia32/MathLlmul.asm | MSFT > + Ia32/MathLlshr.asm | MSFT > + > + Ia32/MathLShiftS64.c | INTEL > + Ia32/MathRShiftU64.c | INTEL > + Ia32/MathFtol.c | INTEL > + > + Ia32/MathLShiftS64.nasm | GCC > + Ia32/MathRShiftU64.nasm | GCC > + > [Packages] > MdePkg/MdePkg.dec >=20 > diff --git a/CryptoPkg/Library/IntrinsicLib/CopyMem.c b/CryptoPkg/Library= /IntrinsicLib/CopyMem.c > deleted file mode 100644 > index 14a213d1dadf..000000000000 > --- a/CryptoPkg/Library/IntrinsicLib/CopyMem.c > +++ /dev/null > @@ -1,47 +0,0 @@ > -/** @file > - Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based > - Cryptographic Library. > - > -Copyright (c) 2010, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#include > -#include > - > -#if defined (__clang__) && !defined (__APPLE__) > - > -/* Copies bytes between buffers */ > -static __attribute__ ((__used__)) > -void * > -__memcpy ( > - void *dest, > - const void *src, > - unsigned int count > - ) > -{ > - return CopyMem (dest, src, (UINTN)count); > -} > - > -__attribute__ ((__alias__ ("__memcpy"))) > -void * > -memcpy ( > - void *dest, > - const void *src, > - unsigned int count > - ); > - > -#else > -/* Copies bytes between buffers */ > -void * > -memcpy ( > - void *dest, > - const void *src, > - unsigned int count > - ) > -{ > - return CopyMem (dest, src, (UINTN)count); > -} > - > -#endif > diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPk= g/Library/IntrinsicLib/MemoryIntrinsics.c > deleted file mode 100644 > index 611e9fd773b0..000000000000 > --- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c > +++ /dev/null > @@ -1,74 +0,0 @@ > -/** @file > - Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based > - Cryptographic Library. > - > -Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#include > -#include > -#include > - > -typedef UINTN size_t; > - > -#if defined (__GNUC__) || defined (__clang__) > -#define GLOBAL_USED __attribute__((used)) > -#else > -#define GLOBAL_USED > -#endif > - > -/* OpenSSL will use floating point support, and C compiler produces the = _fltused > - symbol by default. Simply define this symbol here to satisfy the link= er. */ > -int GLOBAL_USED _fltused =3D 1; > - > -/* Sets buffers to a specified character */ > -void * > -memset ( > - void *dest, > - int ch, > - size_t count > - ) > -{ > - // > - // NOTE: Here we use one base implementation for memset, instead of th= e direct > - // optimized SetMem() wrapper. Because the IntrinsicLib has to b= e built > - // without whole program optimization option, and there will be = some > - // potential register usage errors when calling other optimized = codes. > - // > - > - // > - // Declare the local variables that actually move the data elements as > - // volatile to prevent the optimizer from replacing this function with > - // the intrinsic memset() > - // > - volatile UINT8 *Pointer; > - > - Pointer =3D (UINT8 *)dest; > - while (count-- !=3D 0) { > - *(Pointer++) =3D (UINT8)ch; > - } > - > - return dest; > -} > - > -/* Compare bytes in two buffers. */ > -int > -memcmp ( > - const void *buf1, > - const void *buf2, > - size_t count > - ) > -{ > - return (int)CompareMem (buf1, buf2, count); > -} > - > -int > -strcmp ( > - const char *s1, > - const char *s2 > - ) > -{ > - return (int)AsciiStrCmp (s1, s2); > -} > diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Ia32/MathFtol.c > similarity index 100% > rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathFtol.c > rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathFtol.c > diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c b/MdePkg= /Library/CompilerIntrinsicsLib/Ia32/MathLShiftS64.c > similarity index 100% > rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c > rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLShiftS64.c > diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c b/MdePkg= /Library/CompilerIntrinsicsLib/Ia32/MathRShiftU64.c > similarity index 100% > rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c > rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathRShiftU64.c > diff --git a/MdePkg/Library/CompilerIntrinsicsLib/strcmp.c b/MdePkg/Libra= ry/CompilerIntrinsicsLib/strcmp.c > new file mode 100644 > index 000000000000..937b19a3dff7 > --- /dev/null > +++ b/MdePkg/Library/CompilerIntrinsicsLib/strcmp.c > @@ -0,0 +1,33 @@ > +/** @file > + Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based > + Cryptographic Library. > + > +Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include > +#include > +#include > + > +typedef UINTN size_t; > + > +#if defined (__GNUC__) || defined (__clang__) > +#define GLOBAL_USED __attribute__((used)) > +#else > +#define GLOBAL_USED > +#endif > + > +/* OpenSSL will use floating point support, and C compiler produces the = _fltused > + symbol by default. Simply define this symbol here to satisfy the link= er. */ > +int GLOBAL_USED _fltused =3D 1; > + > +int > +strcmp ( > + const char *s1, > + const char *s2 > + ) > +{ > + return (int)AsciiStrCmp (s1, s2); > +} > diff --git a/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni b/Crypto= Pkg/Library/IntrinsicLib/BaseIntrinsicLib.uni > deleted file mode 100644 > index 47f19d4080f7..000000000000 > --- a/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni > +++ /dev/null > @@ -1,16 +0,0 @@ > -// /** @file > -// Intrinsic Routines Wrapper Library Instance. > -// > -// This module is intrinsic routines wrapper library instance. > -// > -// Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. > -// > -// SPDX-License-Identifier: BSD-2-Clause-Patent > -// > -// **/ > - > - > -#string STR_MODULE_ABSTRACT #language en-US "Intrinsic Routi= nes Wrapper Library Instance" > - > -#string STR_MODULE_DESCRIPTION #language en-US "This module is = intrinsic routines wrapper library instance." > - > diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm > b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLShiftS64.nasm > similarity index 100% > rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm > rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLShiftS64.nasm > diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLlmul.asm b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/MathLlmul.asm > similarity index 100% > rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLlmul.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLlmul.asm > diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLlshr.asm b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Ia32/MathLlshr.asm > similarity index 100% > rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathLlshr.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathLlshr.asm > diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm > b/MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathRShiftU64.nasm > similarity index 100% > rename from CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm > rename to MdePkg/Library/CompilerIntrinsicsLib/Ia32/MathRShiftU64.nasm > -- > 2.36.1