Changeset 32573ff in mainline for kernel/arch/arm32/src/asm.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/asm.S (modified) (2 diffs)

kernel/arch/arm32/src/asm.S

@@ -27 +27 @@
  */
 
+#include <abi/asmtool.h>
+
 .text
 
-.global memcpy_from_uspace
-.global memcpy_to_uspace
-.global memcpy_from_uspace_failover_address
-.global memcpy_to_uspace_failover_address
-.global early_putchar
-
-memcpy_from_uspace:
-memcpy_to_uspace:
+FUNCTION_BEGIN(memcpy_from_uspace)
+FUNCTION_BEGIN(memcpy_to_uspace)
         add r3, r1, #3
         bic r3, r3, #3
@@ -94 +90 @@
                 bne 7b
                 b 3b
+FUNCTION_END(memcpy_from_uspace)
+FUNCTION_END(memcpy_to_uspace)
 
-memcpy_from_uspace_failover_address:
-memcpy_to_uspace_failover_address:
+SYMBOL(memcpy_from_uspace_failover_address)
+SYMBOL(memcpy_to_uspace_failover_address)
         mov r0, #0
         ldmia sp!, {r4, r5, pc}
 
-early_putchar:
+FUNCTION_BEGIN(early_putchar)
         mov pc, lr
+FUNCTION_END(early_putchar)
+