Changeset 32573ff in mainline for kernel/arch/arm32/src/dummy.S

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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 mainline, which has dltest and fixes.

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
-
-# not used on ARM
-sys_tls_set:
-
-dummy:
-        mov pc, lr
+FUNCTION_END(asm_delay_loop)