Changeset 054476d in mainline for kernel/arch/arm32/src/dummy.S

Timestamp:

2016-04-21T20:04:16Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

27f67f5

Parents:

dc0d8b52 (diff), 73b3ecd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge arm32 switch over to using asmtool.h macros

File:

• kernel/arch/arm32/src/dummy.S (modified) (1 diff)

kernel/arch/arm32/src/dummy.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text
 
-.global calibrate_delay_loop
-.global asm_delay_loop
+FUNCTION_BEGIN(calibrate_delay_loop)
+        mov     pc, lr
+FUNCTION_END(calibrate_delay_loop)
 
-.global sys_tls_set
-.global dummy
-
-calibrate_delay_loop:
+FUNCTION_BEGIN(asm_delay_loop)
         mov     pc, lr
-
-asm_delay_loop:
-        mov     pc, lr
+FUNCTION_END(asm_delay_loop)
 
 # not used on ARM
-sys_tls_set:
+FUNCTION_BEGIN(sys_tls_set)
+FUNCTION_BEGIN(dummy)
+        mov pc, lr
+FUNCTION_END(dummy)
+FUNCTION_END(sys_tls_set)
 
-dummy:
-        mov pc, lr