projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
258d225
)
altos/stm: New GAS version requires flags in APSR assignment
author
Keith Packard
<keithp@keithp.com>
Tue, 8 Oct 2013 16:20:12 +0000
(09:20 -0700)
committer
Keith Packard
<keithp@keithp.com>
Tue, 8 Oct 2013 16:20:12 +0000
(09:20 -0700)
Signed-off-by: Keith Packard <keithp@keithp.com>
src/stm/ao_arch_funcs.h
patch
|
blob
|
history
diff --git
a/src/stm/ao_arch_funcs.h
b/src/stm/ao_arch_funcs.h
index 4bcc102324a5cb63fe49d518e684d4ffc072dcd6..b461cd3fbf81dd9f32dac82894ea96d7c5bdaad7 100644
(file)
--- 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");