ArmPkg: use unified asm syntax for CLANG

[mirror_edk2.git] / ArmPkg / Library / DebugAgentSymbolsBaseLib / Arm / DebugAgentException.S

diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
index 0566a89e2c9080177faec4f3cc8c922d20d9a7b0..0f2e4b1ac8afda2b460a736c47bf257929467209 100644 (file)
--- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
+++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/Arm/DebugAgentException.S
@@ -54,6 +54,7 @@ GCC_ASM_EXPORT(DebugAgentVectorTable)
 GCC_ASM_IMPORT(DefaultExceptionHandler)\r
 \r
 .text\r
+.syntax unified\r
 #if !defined(__APPLE__)\r
 .fpu neon    @ makes vpush/vpop assemble\r
 #endif\r
@@ -202,9 +203,9 @@ ASM_PFX(AsmCommonExceptionEntry):
   and       R3, R1, #0x1f           @ Check CPSR to see if User or System Mode\r
   cmp       R3, #0x1f               @ if ((CPSR == 0x10) || (CPSR == 0x1df))\r
   cmpne     R3, #0x10               @\r
-  stmeqed   R2, {lr}^               @   save unbanked lr\r
+  stmdaeq   R2, {lr}^               @   save unbanked lr\r
                                     @ else\r
-  stmneed   R2, {lr}                @   save SVC lr\r
+  stmdane   R2, {lr}                @   save SVC lr\r
 \r
 \r
   ldr       R5, [SP, #0x58]         @ PC is the LR pushed by srsfd\r
@@ -263,9 +264,9 @@ DefaultExceptionHandler (
   and       R1, R1, #0x1f           @ Check to see if User or System Mode\r
   cmp       R1, #0x1f               @ if ((CPSR == 0x10) || (CPSR == 0x1f))\r
   cmpne     R1, #0x10               @\r
-  ldmeqed   R2, {lr}^               @   restore unbanked lr\r
+  ldmibeq   R2, {lr}^               @   restore unbanked lr\r
                                     @ else\r
-  ldmneed   R3, {lr}                @   restore SVC lr, via ldmfd SP!, {LR}\r
+  ldmibne   R3, {lr}                @   restore SVC lr, via ldmfd SP!, {LR}\r
 \r
   ldmfd     SP!,{R0-R12}            @ Restore general purpose registers\r
                                     @ Exception handler can not change SP\r