Changeset 32573ff in mainline for uspace/lib/c/arch/arm32/src/stacktrace_asm.S

Timestamp:

2016-05-02T20:58:16Z (9 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:

• uspace/lib/c/arch/arm32/src/stacktrace_asm.S (modified) (1 diff)

uspace/lib/c/arch/arm32/src/stacktrace_asm.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text
 
-.global stacktrace_prepare
-.global stacktrace_fp_get
-.global stacktrace_pc_get
+FUNCTION_BEGIN(stacktrace_prepare)
+        mov pc, lr
+FUNCTION_END(stacktrace_prepare)
 
-stacktrace_prepare:
-        mov pc, lr
-
-stacktrace_fp_get:
+FUNCTION_BEGIN(stacktrace_fp_get)
         mov r0, fp
         mov pc, lr
+FUNCTION_END(stacktrace_fp_get)
 
-stacktrace_pc_get:
+FUNCTION_BEGIN(stacktrace_pc_get)
         mov r0, lr
         mov pc, lr
+FUNCTION_END(stacktrace_pc_get)
+