From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web09.863.1635884324884271835 for ; Tue, 02 Nov 2021 13:18:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@corthon-com.20210112.gappssmtp.com header.s=20210112 header.b=jrpSZS+Y; spf=none, err=permanent DNS error (domain: corthon.com, ip: 209.85.214.176, mailfrom: bret@corthon.com) Received: by mail-pl1-f176.google.com with SMTP id b13so647384plg.2 for ; Tue, 02 Nov 2021 13:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corthon-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5NGN/FlsrndC6U6yRee2i7zG3ajbPY4X/yJJCCL7mQc=; b=jrpSZS+YL3v09yMnMF9UcHyKP/4I4wGjER1TOJQZs93i5WMK6a+by0womAiaJkpOf6 68TblXpxQVtCHGXlNtlFDQS89np5V0ohPvJgJwFX/bGwU4SpgnEdFZDwilEoO0WuQxXH uKR1O87rz+wdSGQ8cVjHqCe+/20tyW5lTlRVFxlaDH70/6/iqlCYzl2J9+JapnPy2aAu efrXxktqrKrUkoKje3qXSMs8UJ2rI+upe2ls6EzjVHkAzmu6SlO9k2zfhvtjNhWfs3R9 KehiKnXkXxYlHV1XvWIcM6walOQX/xFua53I3TYeFfLtDdp+4tDEcVqS0j4QgFG6KUo+ AYkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5NGN/FlsrndC6U6yRee2i7zG3ajbPY4X/yJJCCL7mQc=; b=yyLwUssIV2jWOFK3BRUpgUX1DW/HJ+o2MF698K2Rn0fggIHxu/3Yt8G+h7Z1O44Ync a1YMiS2dUqBKFtgFN4PskWGgHoiGGc4mUTKYJbfEN9Aov5TXgpdFQ8bTDdlUTQxWTEjV L+g7yBkWOii4rS2WQly8nec0Y7B3Cc5UQJnQlq41hyYnqu/oiLNJD5j5cI9esiMC5Hfd PMq2tEvUtAwM/nVt++R8Hlj3Snt0bk/XeWbOlv7I8dL1lPmghp/8u5ro/NyERqUG2TVR 7D0oXRBfj+xCbp2aFKNK/f/DdH08787T3xta5+ht1YwYRcMdBQhtWUEO1kIKFMzgBonB XRHw== X-Gm-Message-State: AOAM532TfIPC32bgj042W61o4AepjNusHAWEwHF7vvA+nk5kXxrz2KKw 1N4XAnMgn0UMqRzk+oz0D7q0x8E1+rnfc1D3 X-Google-Smtp-Source: ABdhPJwicegRDOSoE/64v56pqNEwbluhW+LuiCheS/wBqwRkn5SGONu/B0nXRFlDZaAuzuLTRaP8dA== X-Received: by 2002:a17:90b:4b4c:: with SMTP id mi12mr9510036pjb.57.1635884324133; Tue, 02 Nov 2021 13:18:44 -0700 (PDT) Return-Path: Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:43 -0700 (PDT) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , 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: [PATCH v2 05/16] ArmPkg and MdePkg: Move the Arm CompilerIntrinsicsLib to MdePkg Date: Tue, 2 Nov 2021 13:17:37 -0700 Message-Id: <20211102201748.1963-6-brbarkel@microsoft.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-1-brbarkel@microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Bret Barkelew TODO: Might keep the name of the .inf. Pending discussion. 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=3D3649 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 =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcmp_ms.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcpy.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcpy_ms.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memmove_ms.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memset.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memset_ms.c = | 0 ArmPkg/ArmPkg.dsc = | 3 +-- CryptoPkg/CryptoPkg.dsc = | 2 +- MdeModulePkg/MdeModulePkg.dsc = | 2 +- {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/AArch64/Atomics.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashldi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/clzsi2.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/divdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/divsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/moddi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/modsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/muldi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/sourcery.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch16.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch32.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch8.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switchu8.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/umoddi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/umodsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.asm = | 0 ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =3D> 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/Libr= ary/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/Libr= ary/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/Lib= rary/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/Libr= ary/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/Pei= ServicesTablePointerLib.inf=0D =0D [LibraryClasses.ARM, LibraryClasses.AARCH64]=0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D =0D # Add support for GCC stack protector=0D NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf=0D @@ -109,7 +109,6 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] [Components.common]=0D ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf=0D ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf=0D - ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf=0D ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf=0D ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf= =0D 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 l= ibrary=0D # into all ARM and AARCH64 images.=0D #=0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D =0D # Add support for stack protector=0D NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf=0D 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 co= mpiler.=0D # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es.=0D #=0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D =0D #=0D # Since software stack checking may be heuristically enabled by the comp= iler=0D diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S b/MdePk= g/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/Li= brary/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/Li= brary/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/Lib= rary/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/Lib= rary/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/Librar= y/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/Libr= ary/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/Lib= rary/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/Lib= rary/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/Libra= ry/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/Lib= rary/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/Li= brary/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/Libra= ry/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/Lib= rary/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/Libra= ry/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/Lib= rary/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/Li= brary/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/Li= brary/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/Lib= rary/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/Lib= rary/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/Lib= rary/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/Libr= ary/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/Li= brary/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/L= ibrary/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/L= ibrary/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/L= ibrary/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/L= ibrary/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/Li= brary/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/L= ibrary/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/Li= brary/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/Li= brary/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/Li= brary/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/Libr= ary/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/Li= brary/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/Li= brary/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/Li= brary/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/Libr= ary/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/Li= brary/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/Lib= rary/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/L= ibrary/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 @@ =0D [Defines]=0D INF_VERSION =3D 0x00010005=0D - BASE_NAME =3D CompilerIntrinsicsLib=0D + BASE_NAME =3D ArmCompilerIntrinsicsLib=0D FILE_GUID =3D 855274FA-3575-4C20-9709-C031DC5589FA= =0D MODULE_TYPE =3D BASE=0D VERSION_STRING =3D 1.0=0D @@ -84,7 +84,6 @@ [Sources.AARCH64] =0D [Packages]=0D MdePkg/MdePkg.dec=0D - ArmPkg/ArmPkg.dec=0D =0D [BuildOptions]=0D MSFT:*_*_*_CC_FLAGS =3D /GL-=0D 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]=0D MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf=0D MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf=0D + MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D =0D [BuildOptions]=0D 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 co= mpiler.=0D # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es.=0D #=0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf=0D ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf=0D =0D 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 com= piler.=0D # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es.=0D #=0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D =0D # Add support for GCC stack protector=0D NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf=0D diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.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/ArmCacheMainte= nanceLib.inf=0D PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActi= onLib/StandaloneMmPeCoffExtraActionLib.inf=0D =0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf=0D =0D [LibraryClasses.common.MM_CORE_STANDALONE]=0D diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc b/Unit= TestFrameworkPkg/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 co= mpiler.=0D # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es.=0D #=0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf=0D =0D #=0D # Since software stack checking may be heuristically enabled by the comp= iler=0D --=20 2.31.1.windows.1