diff options
Diffstat (limited to 'os/rt')
| -rw-r--r-- | os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s | 5 | ||||
| -rw-r--r-- | os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s index a8c0d34cf..7fe77c57f 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s +++ b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s @@ -120,8 +120,9 @@ _port_switch_from_isr: #endif
.globl _port_exit_from_isr
_port_exit_from_isr:
- ldr r3, .L2
- ldr r2, .L3
+ ldr r2, .L2
+ ldr r3, .L3
+ str r3, [r2, #0]
#if CORTEX_ALTERNATE_SWITCH
cpsie i
#endif
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld b/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld index 31c34bbf2..e79774f45 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld +++ b/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld @@ -34,7 +34,7 @@ __ram_start__ = ORIGIN(ram); __ram_size__ = LENGTH(ram);
__ram_end__ = __ram_start__ + __ram_size__;
-ENTRY(ResetHandler)
+ENTRY(Reset_Handler)
SECTIONS
{
|