From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web11.10863.1636028167478893490 for ; Thu, 04 Nov 2021 05:16:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20210112.gappssmtp.com header.s=20210112 header.b=rhykOQEp; spf=pass (domain: nuviainc.com, ip: 209.85.128.50, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f50.google.com with SMTP id y84-20020a1c7d57000000b00330cb84834fso7061787wmc.2 for ; Thu, 04 Nov 2021 05:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fXSVCuLU2MySsxYqn5i5hdu0a0x5ZZJKzsIxkkoAQCk=; b=rhykOQEp1o+HqJP0+Z0btvgO7hzuTbG+jZUKqpVo0UWb/F52oWunK/fTkL7Skbth3L Diz6ek+nfaLgKMNdPbGVc1OiBXvQa9HyGE7xrD1M+FtK3RiD6F6IKpHJhXZ0BM46Xqdr hUMEntmQ7I2DUGQDzopzST/ZwC95IqETtdQ7AluwIICCDoxuFU1Fx+PIcXPcBC6qnaBC u5fJQH+g5BOtQO3QwrKGWZcUs3GxH3xMV2ltsY/gcRw+SI/OF51y+W9qVn7zi2v1rx+S JfT0NldIwTCHFkxg10qTq8kx/mrJIHAgXSQx+U7lUpeqCD4XWn4Z7nX5GmpumRqiNJvU I4KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fXSVCuLU2MySsxYqn5i5hdu0a0x5ZZJKzsIxkkoAQCk=; b=6UEmn8QlXT3lgSWSfdCq3HUrVZzSwzOYKUtHmPIF4VSRTboovnSxLYos7X7oeYO1Zb 80/bKZihN80hhHePq4Ju2cAcd9+b2XSdqykUzoKmQK9yLD8xfU35BGKPcZ6El1wlFe3O QDCqQ39fT2CXZIx3zK2ysauzsk/ErqpgpDtaAYSEvZjVGRhsr6Mg41IRi+z4X16DfHZG vB4iwoszv6cMIJAPS/Ouuy7y58xyrjHWFJvNeNxZEWCKJpFMVGLogAwar1nTlCSQSNcc RQGT/ytp3HNwLyrYcVKP11EZmkq7kDIu+mE6f+LugLKlavyBTBnay6FdbVkIxRxyHO6C rQkQ== X-Gm-Message-State: AOAM531xgHdCYDDdANUdbK4AUSzxgjTxdBI+ktIsjtetQ0W18MZv10Le rQT9z/iVlL3L0QVZXslLJ9r4Pw== X-Google-Smtp-Source: ABdhPJw7d8UncvA3IQwmALeJcvtdu98eWww/e7YybBkbDej/PRL04Cdb0PkIkNKB+ag35GVxnwUV2g== X-Received: by 2002:a05:600c:19d0:: with SMTP id u16mr22904503wmq.111.1636028165863; Thu, 04 Nov 2021 05:16:05 -0700 (PDT) Return-Path: Received: from leviathan (cpc92314-cmbg19-2-0-cust559.5-4.cable.virginm.net. [82.11.186.48]) by smtp.gmail.com with ESMTPSA id k37sm4946359wms.21.2021.11.04.05.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 05:16:05 -0700 (PDT) Date: Thu, 4 Nov 2021 12:16:03 +0000 From: "Leif Lindholm" To: "brbarkel@microsoft.com" Cc: devel@edk2.groups.io, Ard Biesheuvel , Michael D Kinney , Liming Gao , Zhiguang Liu , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Maciej Rabeda , Jiaxin Wu , Siyuan Fu , Ray Ni , Zhichao Gao , Sean Brogan Subject: Re: [PATCH v2 05/16] ArmPkg and MdePkg: Move the Arm CompilerIntrinsicsLib to MdePkg Message-ID: <20211104121603.vbepuuztypullrhv@leviathan> References: <20211102201748.1963-1-brbarkel@microsoft.com> <20211102201748.1963-6-brbarkel@microsoft.com> MIME-Version: 1.0 In-Reply-To: <20211102201748.1963-6-brbarkel@microsoft.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Nov 02, 2021 at 13:17:37 -0700, brbarkel@microsoft.com wrote: > From: Bret Barkelew > > TODO: Might keep the name of the .inf. Pending discussion. Seems a yes on that. If so: Reviewed-by: Leif Lindholm > This aligns better with Mu's philosophy around dependency structuring > and is one of the steps to enable Basecore to have zero CI dependencies > on other Mu repos. > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3649 > > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Michael D Kinney > Cc: Liming Gao > Cc: Zhiguang Liu > Cc: Sami Mujawar > Cc: Jiewen Yao > Cc: Supreeth Venkatesh > Cc: Maciej Rabeda > Cc: Jiaxin Wu > Cc: Siyuan Fu > Cc: Ray Ni > Cc: Zhichao Gao > Cc: Sean Brogan > Signed-off-by: Bret Barkelew > --- > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/memcmp_ms.c | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/memcpy.c | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/memcpy_ms.c | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/memmove_ms.c | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/memset.c | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/memset_ms.c | 0 > ArmPkg/ArmPkg.dsc | 3 +-- > CryptoPkg/CryptoPkg.dsc | 2 +- > MdeModulePkg/MdeModulePkg.dsc | 2 +- > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/AArch64/Atomics.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashldi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/clzsi2.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/divdi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/divsi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/moddi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/modsi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/muldi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/sourcery.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch16.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch32.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch8.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/switchu8.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivdi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivsi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/umoddi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/umodsi3.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.asm | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.S | 0 > {ArmPkg => MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.asm | 0 > ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf => MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf | 3 +-- > MdePkg/MdePkg.dsc | 1 + > NetworkPkg/NetworkPkg.dsc | 2 +- > ShellPkg/ShellPkg.dsc | 2 +- > StandaloneMmPkg/StandaloneMmPkg.dsc | 2 +- > UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc | 2 +- > 58 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c > rename to MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/MdePkg/Library/CompilerIntrinsicsLib/memcpy.c > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c > rename to MdePkg/Library/CompilerIntrinsicsLib/memcpy.c > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c > rename to MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c > rename to MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/MdePkg/Library/CompilerIntrinsicsLib/memset.c > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/memset.c > rename to MdePkg/Library/CompilerIntrinsicsLib/memset.c > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c > rename to MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c > diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc > index 59fd8f295d4f..06ede068f99d 100644 > --- a/ArmPkg/ArmPkg.dsc > +++ b/ArmPkg/ArmPkg.dsc > @@ -101,7 +101,7 @@ [LibraryClasses.common.PEIM] > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf > > [LibraryClasses.ARM, LibraryClasses.AARCH64] > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > > # Add support for GCC stack protector > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > @@ -109,7 +109,6 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] > [Components.common] > ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf > ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf > - ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf > ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf > ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf > diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc > index 0aa72ed87846..eab46e4b4fbc 100644 > --- a/CryptoPkg/CryptoPkg.dsc > +++ b/CryptoPkg/CryptoPkg.dsc > @@ -74,7 +74,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] > # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this library > # into all ARM and AARCH64 images. > # > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > > # Add support for stack protector > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc > index b1d83461865e..ab505f5bb2c6 100644 > --- a/MdeModulePkg/MdeModulePkg.dsc > +++ b/MdeModulePkg/MdeModulePkg.dsc > @@ -183,7 +183,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] > # This library provides the instrinsic functions generated by a given compiler. > # [LibraryClasses.ARM] and NULL mean link this library into all ARM images. > # > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > > # > # Since software stack checking may be heuristically enabled by the compiler > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S b/MdePkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S > rename to MdePkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/div.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/div.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/div.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/div.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/switch.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/switch16.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch16.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/switch32.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch32.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/switch8.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch8.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S b/MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm b/MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm > similarity index 100% > rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm > rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm > diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > similarity index 93% > rename from ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > rename to MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > index fcf48c678119..46224f79ea85 100644 > --- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > +++ b/MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > @@ -11,7 +11,7 @@ > > [Defines] > INF_VERSION = 0x00010005 > - BASE_NAME = CompilerIntrinsicsLib > + BASE_NAME = ArmCompilerIntrinsicsLib > FILE_GUID = 855274FA-3575-4C20-9709-C031DC5589FA > MODULE_TYPE = BASE > VERSION_STRING = 1.0 > @@ -84,7 +84,6 @@ [Sources.AARCH64] > > [Packages] > MdePkg/MdePkg.dec > - ArmPkg/ArmPkg.dec > > [BuildOptions] > MSFT:*_*_*_CC_FLAGS = /GL- > diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc > index a94959169b2f..cb3907c88b4e 100644 > --- a/MdePkg/MdePkg.dsc > +++ b/MdePkg/MdePkg.dsc > @@ -183,5 +183,6 @@ [Components.EBC] > [Components.ARM, Components.AARCH64] > MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf > MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > + MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > > [BuildOptions] > diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc > index cf2164aefe25..1c727a9a4bf1 100644 > --- a/NetworkPkg/NetworkPkg.dsc > +++ b/NetworkPkg/NetworkPkg.dsc > @@ -75,7 +75,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] > # This library provides the instrinsic functions generated by a given compiler. > # [LibraryClasses.ARM] and NULL mean link this library into all ARM images. > # > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf > > diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc > index 6f0d0929319d..25e8831bf36e 100644 > --- a/ShellPkg/ShellPkg.dsc > +++ b/ShellPkg/ShellPkg.dsc > @@ -69,7 +69,7 @@ [LibraryClasses.ARM,LibraryClasses.AARCH64] > # This library provides the instrinsic functions generate by a given compiler. > # [LibraryClasses.ARM] and NULL mean link this library into all ARM images. > # > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > > # Add support for GCC stack protector > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/StandaloneMmPkg.dsc > index 8012f93b7dcc..2c0c9396d633 100644 > --- a/StandaloneMmPkg/StandaloneMmPkg.dsc > +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc > @@ -67,7 +67,7 @@ [LibraryClasses.AARCH64, LibraryClasses.ARM] > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf > PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf > > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > > [LibraryClasses.common.MM_CORE_STANDALONE] > diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc > index 8adf690098ae..2bbf2398b7e9 100644 > --- a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc > +++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc > @@ -37,7 +37,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] > # This library provides the instrinsic functions generated by a given compiler. > # [LibraryClasses.ARM] and NULL mean link this library into all ARM images. > # > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf > > # > # Since software stack checking may be heuristically enabled by the compiler > -- > 2.31.1.windows.1 >