From 5e61c80327325e9086b56235a46452d79968c58c Mon Sep 17 00:00:00 2001
From: Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
Date: Fri, 18 Sep 2009 08:07:23 +0000
Subject: 	* rtems/score/cpu.h: Fix for inline asm in _CPU_Fatal_halt(). 
 * rtems/asm.h: Added macro to define ARM functions. 	* cpu_asm.S,
 arm_exc_handler_low.S: Use macro from above.

---
 cpukit/score/cpu/arm/cpu_asm.S | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'cpukit/score/cpu/arm/cpu_asm.S')

diff --git a/cpukit/score/cpu/arm/cpu_asm.S b/cpukit/score/cpu/arm/cpu_asm.S
index 91654fa4bb..2c0ed16e79 100644
--- a/cpukit/score/cpu/arm/cpu_asm.S
+++ b/cpukit/score/cpu/arm/cpu_asm.S
@@ -22,24 +22,6 @@
 #include <rtems/asm.h>
 #include <rtems/score/cpu_asm.h>
 
-/*
- *  function declaration macro (start body in ARM mode)
- */
-#ifdef __thumb__
-  #define FUNC_START_ARM(_name_)              \
-    .code   16                              ;\
-    .thumb_func                             ;\
-    .globl _name_                           ;\
-_name_:                                         ;\
-     bx      pc                              ;\
-     .code   32                              ;\
-_name_ ## _ARM:
-#else
-  #define FUNC_START_ARM(_name_) \
-     .globl _name_; \
-_name_: 
-#endif
-
         .text
 
 /*
@@ -58,7 +40,7 @@ _name_:
  *        
  */
  
-FUNC_START_ARM(_CPU_Context_switch)
+DEFINE_FUNCTION_ARM(_CPU_Context_switch)
 /* Start saving context */
 	mrs	r2, cpsr
 	stmia	r0,  {r2, r4, r5, r6, r7, r8, r9, r10, r11, r13, r14}
@@ -81,6 +63,6 @@ _restore:
  *  It must match _CPU_Context_switch()
  *
  */
-FUNC_START_ARM(_CPU_Context_restore)
+DEFINE_FUNCTION_ARM(_CPU_Context_restore)
         mov     r1, r0
         b       _restore
-- 
cgit v1.2.3