summaryrefslogtreecommitdiffstats
path: root/ArmVirtPkg
diff options
context:
space:
mode:
authorOliver Smith-Denny <osde@linux.microsoft.com>2024-08-06 15:19:23 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-09-12 19:36:59 +0000
commit734e71f428a4fdac5d82ae9c093911053356f6ff (patch)
tree3af3c3f9e329b079b8ccd28a3992d610ebafde61 /ArmVirtPkg
parent656665d289b355ada71ad718759200c44c655264 (diff)
downloadedk2-734e71f428a4fdac5d82ae9c093911053356f6ff.tar.gz
edk2-734e71f428a4fdac5d82ae9c093911053356f6ff.tar.bz2
edk2-734e71f428a4fdac5d82ae9c093911053356f6ff.zip
MdePkg: Move AsmMacroIoLib*.h from ArmPkg
AsmMacroIoLib.h and AsmMacroIoLibV8.h are used by the CompilerIntrinsicsLib, which is moving to MdePkg. These functions provide standard definitions for ARM/AARCH64 assembly code, respectively, and so are moved to the arch directories in MdePkg to avoid MdePkg having a dependency on ArmPkg. Now that the files are in Arm/ and AArch64/ directories, the filenames are changed to AsmMacroLib.h as we can distinguish the architecture from the path. AsmMacroIoLib.inc is unused and so is removed. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
Diffstat (limited to 'ArmVirtPkg')
-rw-r--r--ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S2
-rw-r--r--ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S2
-rw-r--r--ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S2
3 files changed, 3 insertions, 3 deletions
diff --git a/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S b/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S
index bdb460c7ee..f20395c38b 100644
--- a/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S
+++ b/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S
@@ -5,7 +5,7 @@
//
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
.macro mov_i, reg:req, imm:req
movz \reg, :abs_g1:\imm
diff --git a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
index fc06c28daa..06a0020f25 100644
--- a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -6,7 +6,7 @@
//
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
//
diff --git a/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
index f0536c65eb..cfb5de864f 100644
--- a/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
+++ b/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
@@ -6,7 +6,7 @@
//
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions