aboutsummaryrefslogtreecommitdiffstats
path: root/os/rt/ports/ARMCMx/compilers/GCC
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-03-22 11:13:45 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-03-22 11:13:45 +0000
commitbd89c86c0654c22413144e174bd9e04327efdc81 (patch)
treef226c7f51834187343723c0a6f78948c9d638e44 /os/rt/ports/ARMCMx/compilers/GCC
parentb35acec16a2df256857dac43f371bce1d6848431 (diff)
downloadChibiOS-bd89c86c0654c22413144e174bd9e04327efdc81.tar.gz
ChibiOS-bd89c86c0654c22413144e174bd9e04327efdc81.tar.bz2
ChibiOS-bd89c86c0654c22413144e174bd9e04327efdc81.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7793 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/ports/ARMCMx/compilers/GCC')
-rw-r--r--os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
index b7750aebc..8446a0ecd 100644
--- a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
@@ -88,12 +88,12 @@ _port_thread_start:
#if CH_DBG_STATISTICS
bl _stats_stop_measure_crit_thd
#endif
-#if !CORTEX_SIMPLIFIED_PRIORITY
- movs r3, #0
- msr BASEPRI, r3
-#else /* CORTEX_SIMPLIFIED_PRIORITY */
+#if CORTEX_SIMPLIFIED_PRIORITY
cpsie i
-#endif /* CORTEX_SIMPLIFIED_PRIORITY */
+#else
+ movs r3, #0 /* CORTEX_BASEPRI_DISABLED */
+ msr BASEPRI, r3
+#endif
mov r0, r5
blx r4
bl chThdExit