From 8a3e3223dadc33fff46522ee1f8c9a57affc8b0f Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 6 Aug 2013 15:00:42 +0000
Subject: git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6093
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm.s   | 74 ----------------------
 .../ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s     | 74 ++++++++++++++++++++++
 2 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm.s
 create mode 100644 os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s

(limited to 'os')

diff --git a/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm.s b/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm.s
deleted file mode 100644
index 924a0b6d0..000000000
--- a/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm.s
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012,2013 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file    ARM/chcoreasm.s
- * @brief   ARM7/9 architecture port low level code.
- *
- * @addtogroup ARM_CORE
- * @{
- */
-
-#include "chconf.h"
-#include "chcore.h"
-
-#if !defined(FALSE) || defined(__DOXYGEN__)
-#define FALSE                   0
-#endif
-
-#if !defined(TRUE) || defined(__DOXYGEN__)
-#define TRUE                    1
-#endif
-
-#if !defined(__DOXYGEN__)
-
-                    .syntax unified
-                    .cpu cortex-m4
-                    .fpu softvfp
-
-                    .thumb
-                    .text
-
-/*
- * Thread trampoline code.
- *
- * Threads execution starts here, the code leaves the system critical zone
- * and then jumps into the thread function passed in register R4. The
- * register R5 contains the thread parameter. The function chThdExit() is
- * called on thread function return.
- */
-                    .thumb_func
-                    .globl _port_thread_start
-_port_thread_start:
-#if CH_DBG_SYSTEM_STATE_CHECK
-                    bl      dbg_check_unlock
-#endif
-#if CH_DBG_STATISTICS
-                    bl      _stats_stop_measure_crit_thd
-#endif
-                    movs    r3, #0
-                    msr     BASEPRI, r3
-                    mov     r0, r5
-                    blx     r4
-                    bl      chThdExit
-
-#endif /* !defined(__DOXYGEN__) */
-
-/** @} */
diff --git a/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s b/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
new file mode 100644
index 000000000..924a0b6d0
--- /dev/null
+++ b/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
@@ -0,0 +1,74 @@
+/*
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011,2012,2013 Giovanni Di Sirio.
+
+    This file is part of ChibiOS/RT.
+
+    ChibiOS/RT is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/RT is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file    ARM/chcoreasm.s
+ * @brief   ARM7/9 architecture port low level code.
+ *
+ * @addtogroup ARM_CORE
+ * @{
+ */
+
+#include "chconf.h"
+#include "chcore.h"
+
+#if !defined(FALSE) || defined(__DOXYGEN__)
+#define FALSE                   0
+#endif
+
+#if !defined(TRUE) || defined(__DOXYGEN__)
+#define TRUE                    1
+#endif
+
+#if !defined(__DOXYGEN__)
+
+                    .syntax unified
+                    .cpu cortex-m4
+                    .fpu softvfp
+
+                    .thumb
+                    .text
+
+/*
+ * Thread trampoline code.
+ *
+ * Threads execution starts here, the code leaves the system critical zone
+ * and then jumps into the thread function passed in register R4. The
+ * register R5 contains the thread parameter. The function chThdExit() is
+ * called on thread function return.
+ */
+                    .thumb_func
+                    .globl _port_thread_start
+_port_thread_start:
+#if CH_DBG_SYSTEM_STATE_CHECK
+                    bl      dbg_check_unlock
+#endif
+#if CH_DBG_STATISTICS
+                    bl      _stats_stop_measure_crit_thd
+#endif
+                    movs    r3, #0
+                    msr     BASEPRI, r3
+                    mov     r0, r5
+                    blx     r4
+                    bl      chThdExit
+
+#endif /* !defined(__DOXYGEN__) */
+
+/** @} */
-- 
cgit v1.2.3