From: Keith Packard <keithp@keithp.com>
Date: Tue, 8 Oct 2013 16:20:12 +0000 (-0700)
Subject: altos/stm: New GAS version requires flags in APSR assignment
X-Git-Tag: 1.2.9.4~59
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=16965716c02eb79b449d9d3b264814d775660134

altos/stm: New GAS version requires flags in APSR assignment

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 4bcc1023..b461cd3f 100644
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -329,7 +329,7 @@ static inline void ao_arch_restore_stack(void) {
 
 	/* Restore APSR */
 	asm("pop {r0}");
-	asm("msr apsr,r0");
+	asm("msr apsr_nczvq,r0");
 
 	/* Restore general registers */
 	asm("pop {r0-r12,lr}\n");