From 734e71f428a4fdac5d82ae9c093911053356f6ff Mon Sep 17 00:00:00 2001 From: Oliver Smith-Denny Date: Tue, 6 Aug 2024 15:19:23 -0700 Subject: 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 --- ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S | 2 +- ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S | 2 +- ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ArmVirtPkg') 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 +#include .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 +#include 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 +#include ASM_FUNC(_ModuleEntryPoint) // Do early platform specific actions -- cgit v1.2.3