Index: boot/arch/sparc64/src/asm.S
===================================================================
--- boot/arch/sparc64/src/asm.S	(revision 1b34360f5f571e1fd83499fdb1cc94d881f2548d)
+++ boot/arch/sparc64/src/asm.S	(revision 6f2c1fff143dbbbc751f1f8ba1ddd09d90f7b48e)
@@ -28,4 +28,5 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 
@@ -42,11 +43,7 @@
 .register %g7, #scratch
 
-.global start
-.global halt
-.global jump_to_kernel
-
 .section BOOTSTRAP, "ax"
 
-start:
+SYMBOL(start)
 	ba %xcc, 1f
 	nop
@@ -96,9 +93,10 @@
 .text
 
-halt:
+FUNCTION_BEGIN(halt)
 	ba %xcc, halt
 	nop
+FUNCTION_END(halt)
 
-jump_to_kernel:
+FUNCTION_BEGIN(jump_to_kernel)
 	/*
 	 * Guarantee cache coherence:
@@ -133,4 +131,5 @@
 	jmp %o3
 	nop
+FUNCTION_END(jump_to_kernel)
 
 # Flush I-cache
@@ -158,6 +157,5 @@
 #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,2 +173,3 @@
 	ret
 	restore %o0, 0, %o0
+FUNCTION_END(ofw)