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>
2025-04-08 17:05:09 +02:00 · 2024-08-06 15:19:23 -07:00 · 2024-08-06 15:19:23 -07:00 · 734e71f428
commit 734e71f428
parent 656665d289
68 changed files with 65 additions and 98 deletions
--- a/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S
+++ b/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S
@ -5,7 +5,7 @@
 #
 #

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 #if !defined(__clang__)

--- a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
+++ b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
@ -5,7 +5,7 @@
 #
 #

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
 #include <Library/ArmLib.h>

 // For the moment we assume this will run in SVC mode on ARMv7
--- a/ArmPkg/Drivers/ArmPsciMpServicesDxe/MpFuncs.S
+++ b/ArmPkg/Drivers/ArmPsciMpServicesDxe/MpFuncs.S
@ -7,7 +7,7 @@
 .text
 .align 3

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
 #include <IndustryStandard/ArmStdSmc.h>
 #include <Library/ArmLib.h>

--- a/ArmPkg/Include/AsmMacroIoLib.inc
+++ b/ArmPkg/Include/AsmMacroIoLib.inc
@ -1,33 +0,0 @@
-;%HEADER%
-;/** @file
-;  Macros to work around lack of Apple support for LDR register, =expr
-;
-;  Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
-;  Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
-;
-;  SPDX-License-Identifier: BSD-2-Clause-Patent
-;
-;**/
-
-
-  MACRO
-  adrll   $Reg, $Symbol
-  add     $Reg, pc, #-8
-  RELOC   R_ARM_ALU_PC_G0_NC, $Symbol
-  add     $Reg, $Reg, #-4
-  RELOC   R_ARM_ALU_PC_G1_NC, $Symbol
-  add     $Reg, $Reg, #0
-  RELOC   R_ARM_ALU_PC_G2, $Symbol
-  MEND
-
-  MACRO
-  ldrl    $Reg, $Symbol
-  add     $Reg, pc, #-8
-  RELOC   R_ARM_ALU_PC_G0_NC, $Symbol
-  add     $Reg, $Reg, #-4
-  RELOC   R_ARM_ALU_PC_G1_NC, $Symbol
-  ldr     $Reg, [$Reg, #0]
-  RELOC   R_ARM_LDR_PC_G2, $Symbol
-  MEND
-
-  END
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
@ -9,7 +9,7 @@

 #include <AArch64/AArch64.h>
 #include <Library/PcdLib.h>
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
 #include <Protocol/DebugSupport.h> // for exception type definitions

 /*
--- a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S
+++ b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S
@ -6,7 +6,7 @@
 //
 //

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(ArmCallHvc)
  // Push x0 on the stack - The stack must always be quad-word aligned
--- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
+++ b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
@ -6,7 +6,7 @@
 //
 //

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .arch_extension virt

--- a/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimerSupport.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimerSupport.S
@ -7,7 +7,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(ArmReadCntFrq)
  mrs   x0, cntfrq_el0           // Read CNTFRQ
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@ -10,7 +10,7 @@
 #------------------------------------------------------------------------------

 #include <AArch64/AArch64.h>
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 .set CTRL_M_BIT,      (1 << 0)
 .set CTRL_A_BIT,      (1 << 1)
--- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S
@ -8,7 +8,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 .set DAIF_RD_FIQ_BIT,   (1 << 6)
 .set DAIF_RD_IRQ_BIT,   (1 << 7)
--- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S
+++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S
@ -8,7 +8,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 .set MPIDR_U_BIT,    (30)
 .set MPIDR_U_MASK,   (1 << MPIDR_U_BIT)
--- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S
@ -8,7 +8,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(ArmReadMidr)
  mrc     p15,0,R0,c0,c0,0
--- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S
+++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S
@ -8,7 +8,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(ArmIsMpCore)
  mrc     p15,0,R0,c0,c0,5
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S
@ -7,7 +7,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(ArmReadCntFrq)
  mrc    p15, 0, r0, c14, c0, 0    @ Read CNTFRQ
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
@ -8,7 +8,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .set DC_ON, (0x1<<2)
 .set IC_ON, (0x1<<12)
--- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S
+++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

  .set CTRL_M_BIT,      (1 << 0)

--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibV7Support.S
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibV7Support.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .text
 .align 2
--- a/ArmPkg/Library/ArmMonitorLib/AArch64/ArmMonitorLib.S
+++ b/ArmPkg/Library/ArmMonitorLib/AArch64/ArmMonitorLib.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 /** Monitor call.

--- a/ArmPkg/Library/ArmMonitorLib/Arm/ArmMonitorLib.S
+++ b/ArmPkg/Library/ArmMonitorLib/Arm/ArmMonitorLib.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 /** Monitor call.

--- a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S
+++ b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(ArmCallSmc)
  // Push x0 on the stack - The stack must always be quad-word aligned
--- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
+++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .arch_extension sec

--- a/ArmPkg/Library/ArmSvcLib/AArch64/ArmSvc.S
+++ b/ArmPkg/Library/ArmSvcLib/AArch64/ArmSvc.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 .text
 .align 3
--- a/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/ashlti3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/ashlti3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__ashlti3)
  # return if shift is 0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__ashldi3)
  cmp  r2, #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__ashrdi3)
  cmp  r2, #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__clzsi2)
  @ frame_needed = 1, uses_anonymous_args = 0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__ctzsi2)
  uxth  r3, r0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__divdi3)
  @ args = 0, pretend = 0, frame = 0
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__divsi3)
  eor  r3, r0, r0, asr #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 #
 #UINT64
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
@ -6,7 +6,7 @@
 //
 //------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 //
 // A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}},
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 #
 #VOID
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 #VOID
 #EFIAPI
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__lshrdi3)
  cmp  r2, #31
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 # VOID
 # EFIAPI
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__moddi3)
  stmfd  sp!, {r4, r5, r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__modsi3)
  stmfd  sp!, {r4, r5, r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__muldi3)
  stmfd  sp!, {r4, r5, r6, r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
@ -7,7 +7,7 @@
 #**/
 #

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .syntax unified

--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
@ -7,7 +7,7 @@
 #**/
 #

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .syntax unified

--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
@ -7,7 +7,7 @@
 #**/
 #

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .syntax unified

--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
@ -7,7 +7,7 @@
 #**/
 #

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 .syntax unified

--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__ucmpdi2)
  stmfd  sp!, {r4, r5, r8, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__udivdi3)
  stmfd  sp!, {r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

  .syntax unified

--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

  .syntax unified

--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__umoddi3)
  stmfd  sp!, {r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(__umodsi3)
  stmfd  sp!, {r4, r5, r7, lr}
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 #
 #UINT32
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 #
 #UINT32
--- a/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S
+++ b/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S
@ -7,7 +7,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(GccSemihostCall)
  hlt     #0xf000
--- a/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S
+++ b/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 /*
  Semihosting operation request mechanism
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
 #include <Library/ArmLib.h>

 ASM_FUNC(ArmPlatformPeiBootAction)
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
 #include <Library/ArmLib.h>

 ASM_FUNC(ArmPlatformPeiBootAction)
--- a/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(_ModuleEntryPoint)
  // Do early platform specific actions
--- a/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 #include <Arm/AArch32.h>

--- a/ArmPlatformPkg/Sec/AArch64/Exception.S
+++ b/ArmPlatformPkg/Sec/AArch64/Exception.S
@ -6,7 +6,7 @@
 #

 #include <AArch64/AArch64.h>
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
 #include <Base.h>
 #include <AutoGen.h>

--- a/ArmPlatformPkg/Sec/AArch64/Helper.S
+++ b/ArmPlatformPkg/Sec/AArch64/Helper.S
@ -5,7 +5,7 @@
 #
 #=======================================================================================

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
 #include <AArch64/AArch64.h>

 // Setup EL1 while in EL1
--- a/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(_ModuleEntryPoint)
  // Do early platform specific actions
--- a/ArmPlatformPkg/Sec/AArch64/SwitchStack.S
+++ b/ArmPlatformPkg/Sec/AArch64/SwitchStack.S
@ -8,7 +8,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>

 #/**
 #  This allows the caller to switch the stack and return
--- a/ArmPlatformPkg/Sec/Arm/Exception.S
+++ b/ArmPlatformPkg/Sec/Arm/Exception.S
@ -5,7 +5,7 @@
 #
 #

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
 #include <Base.h>
 #include <AutoGen.h>

--- a/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S
@ -5,7 +5,7 @@
 //
 //

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 ASM_FUNC(_ModuleEntryPoint)
  // Do early platform specific actions
--- a/ArmPlatformPkg/Sec/Arm/SwitchStack.S
+++ b/ArmPlatformPkg/Sec/Arm/SwitchStack.S
@ -6,7 +6,7 @@
 #
 #------------------------------------------------------------------------------

-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>

 #/**
 #  This allows the caller to switch the stack and return
--- 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
--- 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)
  //
--- 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
--- a/MdePkg/Include/AArch64/AsmMacroLib.h
+++ b/MdePkg/Include/AArch64/AsmMacroLib.h
--- a/MdePkg/Include/Arm/AsmMacroLib.h
+++ b/MdePkg/Include/Arm/AsmMacroLib.h