Changeset a52e2f4 in mainline for kernel/arch/sparc64/src/asm.S

Timestamp:

2016-04-23T20:27:28Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0407636

Parents:

27f67f5

Message:

sparc64: use asmtool.h macros for defining symbols

File:

• kernel/arch/sparc64/src/asm.S (modified) (4 diffs)

kernel/arch/sparc64/src/asm.S

@@ -27 +27 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 #include <arch/stack.h>
@@ -38 +39 @@
  * Almost the same as memcpy() except the loads are from userspace.
  */
-.global memcpy_from_uspace
-memcpy_from_uspace:
+FUNCTION_BEGIN(memcpy_from_uspace)
         mov %o0, %o3  /* save dst */
         add %o1, 7, %g1
@@ -108 +108 @@
                 jmp %o7 + 8  /* exit point */
                 mov %o3, %o0
+FUNCTION_END(memcpy_from_uspace)
 
 /*
  * Almost the same as memcpy() except the stores are to userspace.
  */
-.global memcpy_to_uspace
-memcpy_to_uspace:
+FUNCTION_BEGIN(memcpy_to_uspace)
         mov %o0, %o3  /* save dst */
         add %o1, 7, %g1
@@ -182 +182 @@
                 jmp     %o7 + 8  /* exit point */
                 mov     %o3, %o0
+FUNCTION_END(memcpy_to_uspace)
 
-.global memcpy_from_uspace_failover_address
-.global memcpy_to_uspace_failover_address
-memcpy_from_uspace_failover_address:
-memcpy_to_uspace_failover_address:
+SYMBOL(memcpy_from_uspace_failover_address)
+SYMBOL(memcpy_to_uspace_failover_address)
         jmp %o7 + 8   /* exit point */
         mov %g0, %o0  /* return 0 on failure */
 
-.global early_putchar
-early_putchar:
+FUNCTION_BEGIN(early_putchar)
         retl
         nop
+FUNCTION_END(early_putchar)