From a739e4e7abaf487e57647788fc93ca5e11727bbb Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Tue, 16 Feb 2016 13:01:03 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8904
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s')

diff --git a/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s b/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
index 935c7630f..e5fe3aa0f 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
+++ b/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
@@ -105,8 +105,14 @@ _port_thread_start:
                 cpsie   i
                 mov     r0, r5
                 blx     r4
+#if defined(_CHIBIOS_RT_CONF_)
                 movs    r0, #0              /* MSG_OK */
                 bl      chThdExit
+#endif
+#if defined(_CHIBIOS_NIL_CONF_)
+                mov     r3, #0
+                bl      chSysHalt
+#endif
 
 /*--------------------------------------------------------------------------*
  * Post-IRQ switch code.
-- 
cgit v1.2.3