UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / ArmPkg / Library / CompilerIntrinsicsLib / Arm / switch8.S

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
index 688e106a96f4615196c9c38dbb9d26758952bfa9..aea048f4fba2cf5b9808e43487e74dd25f80d37f 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
@@ -2,27 +2,20 @@
 #  Compiler intrinsic for ARM compiler\r
 #\r
 #  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http)://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.;\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 #**/\r
-#        \r
+#\r
 \r
-.text\r
-.p2align 2\r
+#include <AsmMacroIoLib.h>\r
 \r
-GCC_ASM_EXPORT(__switch8)\r
+.syntax unified\r
 \r
-ASM_PFX(__switch8):\r
+ASM_FUNC(__switch8)\r
     ldrb      ip, [lr, #-1]\r
     cmp       r0, ip\r
-    ldrccsb   r0, [lr, r0]\r
-    ldrcssb   r0, [lr, ip]\r
+    ldrsbcc   r0, [lr, r0]\r
+    ldrsbcs   r0, [lr, ip]\r
     add       ip, lr, r0, lsl #1\r
     bx        ip\r
 \r