Changeset 32573ff in mainline for boot/arch/sparc64/src/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:

• boot/arch/sparc64/src/asm.S (modified) (6 diffs)

boot/arch/sparc64/src/asm.S

@@ -28 +28 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 
@@ -42 +43 @@
 .register %g7, #scratch
 
-.global start
-.global halt
-.global jump_to_kernel
-
 .section BOOTSTRAP, "ax"
 
-start:
+SYMBOL(start)
         ba %xcc, 1f
         nop
@@ -96 +93 @@
 .text
 
-halt:
+FUNCTION_BEGIN(halt)
         ba %xcc, halt
         nop
+FUNCTION_END(halt)
 
-jump_to_kernel:
+FUNCTION_BEGIN(jump_to_kernel)
         /*
          * Guarantee cache coherence:
@@ -133 +131 @@
         jmp %o3
         nop
+FUNCTION_END(jump_to_kernel)
 
 # Flush I-cache
@@ -158 +157 @@
 #endif  /* PROCESSOR_us || PROCESSOR_us3 */
 
-.global ofw
-ofw:
+FUNCTION_BEGIN(ofw)
         save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         set ofw_cif, %l0
@@ -175 +173 @@
         ret
         restore %o0, 0, %o0
+FUNCTION_END(ofw)