Changeset 32573ff in mainline for uspace/lib/c/arch/arm32/src/fibril.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:

• uspace/lib/c/arch/arm32/src/fibril.S (modified) (3 diffs)

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

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text
 
-.global context_save
-.global context_restore
-
-context_save:
+FUNCTION_BEGIN(context_save)
         stmia r0!, {sp, lr}
         stmia r0!, {r4-r11}
@@ -39 +38 @@
         mov r0, #1
         mov pc, lr
+FUNCTION_END(context_save)
 
-context_restore:
+FUNCTION_BEGIN(context_restore)
         ldmia r0!, {sp, lr}
         ldmia r0!, {r4-r11}
@@ -47 +47 @@
         mov r0, #0
         mov pc, lr
+FUNCTION_END(context_restore)