From 4261eb1befd6550f4a9af8109a42e6c84493cfc7 Mon Sep 17 00:00:00 2001
From: Oliver Smith-Denny <osde@microsoft.com>
Date: Mon, 22 Sep 2025 16:26:56 -0700
Subject: [PATCH] ArmPkg: Remove ARM32 Support from ArmHvcLib

edk2 is dropping support for the ARM32 architecture. This
commit removes ARM32 files from ArmHvcLib.

Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>
---
 ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S  | 45 --------------------------
 ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf |  3 --
 2 files changed, 48 deletions(-)
 delete mode 100644 ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S

diff --git a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
deleted file mode 100644
index 9676529c17..0000000000
--- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  Copyright (c) 2012-2014, ARM Limited. All rights reserved.
-//  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
-//
-//  SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-//
-
-#include <AsmMacroLib.h>
-
-.arch_extension virt
-
-ASM_FUNC(ArmCallHvc)
-    push    {r4-r8}
-    // r0 will be popped just after the HVC call
-    push    {r0}
-
-    // Load the HVC arguments values into the appropriate registers
-    ldr     r7, [r0, #28]
-    ldr     r6, [r0, #24]
-    ldr     r5, [r0, #20]
-    ldr     r4, [r0, #16]
-    ldr     r3, [r0, #12]
-    ldr     r2, [r0, #8]
-    ldr     r1, [r0, #4]
-    ldr     r0, [r0, #0]
-
-    hvc     #0
-
-    // Pop the ARM_HVC_ARGS structure address from the stack into r8
-    pop     {r8}
-
-    // Load the HVC returned values into the appropriate registers
-    // A HVC call can return up to 4 values - we do not need to store back r4-r7.
-    str     r3, [r8, #12]
-    str     r2, [r8, #8]
-    str     r1, [r8, #4]
-    str     r0, [r8, #0]
-
-    mov     r0, r8
-
-    // Restore the registers r4-r8
-    pop     {r4-r8}
-
-    bx      lr
diff --git a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
index c5f2a016c0..366ae42c88 100644
--- a/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
+++ b/ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
@@ -14,9 +14,6 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmHvcLib
 
-[Sources.ARM]
-  Arm/ArmHvc.S      | GCC
-
 [Sources.AARCH64]
   AArch64/ArmHvc.S