From 93bcaf3650a2d561623d233efc56b339dbb20397 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 8 Nov 2015 00:59:18 +0100 Subject: [PATCH] arm/arch_exceptions.S: Replace spsr_all with spsr After a quick look at binutils, they seem to be equal, however, Clang does not accept the _all one. --- src/system/kernel/arch/arm/arch_exceptions.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/system/kernel/arch/arm/arch_exceptions.S b/src/system/kernel/arch/arm/arch_exceptions.S index a67ff888f2..42ff0bb533 100644 --- a/src/system/kernel/arch/arm/arch_exceptions.S +++ b/src/system/kernel/arch/arm/arch_exceptions.S @@ -32,20 +32,20 @@ str r0, [sp, #-4]! /* Push return address */ str lr, [sp, #-4]! /* Push SVC lr */ str r2, [sp, #-4]! /* Push SVC sp */ - msr spsr_all, r3 /* Restore correct spsr */ + msr spsr, r3 /* Restore correct spsr */ ldmdb r1, {r0-r3} /* Restore 4 regs from xxx mode */ sub sp, sp, #(4*15) /* Adjust the stack pointer */ stmia sp, {r0-r12} /* Push the user mode registers */ add r0, sp, #(4*13) /* Adjust the stack pointer */ stmia r0, {r13-r14}^ /* Push the user mode registers */ mov r0, r0 /* NOP for previous instruction */ - mrs r0, spsr_all + mrs r0, spsr str r0, [sp, #-4]! /* Save spsr */ .endm .macro PULLFRAMEFROMSVCANDEXIT ldr r0, [sp], #0x0004 /* Get the SPSR from stack */ - msr spsr_all, r0 /* restore SPSR */ + msr spsr, r0 /* restore SPSR */ ldmia sp, {r0-r14}^ /* Restore registers (usr mode) */ mov r0, r0 /* NOP for previous instruction */ add sp, sp, #(4*15) /* Adjust the stack pointer */