Index: boot/arch/arm32/src/asm.S
===================================================================
--- boot/arch/arm32/src/asm.S	(revision 93d8022e9ee8dcf2dc81eb3c64004042947f578c)
+++ boot/arch/arm32/src/asm.S	(revision 5cbccd4acbdbb068412b7105503d09315968f2a2)
@@ -27,32 +27,28 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 
 .section BOOTSTRAP
 
-.global start
-.global boot_pt
-.global boot_stack
-.global halt
-.global jump_to_kernel
-
-start:
+SYMBOL(start)
 	ldr sp, =boot_stack
 	b bootstrap
 
 .section BOOTPT
-boot_pt:
+SYMBOL(boot_pt)
 	.space PTL0_ENTRIES * PTL0_ENTRY_SIZE
 
 .section BOOTSTACK
 	.space 4096
-boot_stack:
+SYMBOL(boot_stack)
 
 .text
 
-halt:
+FUNCTION_BEGIN(halt)
 	b halt
+FUNCTION_END(halt)
 
-jump_to_kernel:
+FUNCTION_BEGIN(jump_to_kernel)
 	#
 	# Make sure that the I-cache, D-cache and memory are mutually coherent
@@ -108,2 +104,4 @@
 #endif
 	mov pc, r0
+FUNCTION_END(jump_to_kernel)
+
Index: boot/arch/arm32/src/eabi.S
===================================================================
--- boot/arch/arm32/src/eabi.S	(revision 93d8022e9ee8dcf2dc81eb3c64004042947f578c)
+++ boot/arch/arm32/src/eabi.S	(revision 5cbccd4acbdbb068412b7105503d09315968f2a2)
@@ -27,28 +27,23 @@
 #
 
+#include <abi/asmtool.h>
+
 .text
 
-.global __aeabi_idiv
-.global __aeabi_uidiv
-
-.global __aeabi_idivmod
-.global __aeabi_uidivmod
-
-.global __aeabi_ldivmod
-.global __aeabi_uldivmod
-
-__aeabi_idiv:
+FUNCTION_BEGIN(__aeabi_idiv)
 	push {lr}
 	bl __divsi3
 	pop {lr}
 	mov pc, lr
+FUNCTION_END(__aeabi_idiv)
 
-__aeabi_uidiv:
+FUNCTION_BEGIN(__aeabi_uidiv)
 	push {lr}
 	bl __udivsi3
 	pop {lr}
 	mov pc, lr
+FUNCTION_END(__aeabi_uidiv)
 
-__aeabi_idivmod:
+FUNCTION_BEGIN(__aeabi_idivmod)
 	push {lr}
 	sub sp, sp, #12
@@ -59,6 +54,7 @@
 	pop {lr}
 	mov pc, lr
+FUNCTION_END(__aeabi_idivmod)
 
-__aeabi_uidivmod:
+FUNCTION_BEGIN(__aeabi_uidivmod)
 	push {lr}
 	sub sp, sp, #12
@@ -69,6 +65,7 @@
 	pop {lr}
 	mov pc, lr
+FUNCTION_END(__aeabi_uidivmod)
 
-__aeabi_ldivmod:
+FUNCTION_BEGIN(__aeabi_ldivmod)
 	push {lr}
 	sub sp, sp, #24
@@ -80,6 +77,7 @@
 	pop {lr}
 	mov pc, lr
+FUNCTION_END(__aeabi_ldivmod)
 
-__aeabi_uldivmod:
+FUNCTION_BEGIN(__aeabi_uldivmod)
 	push {lr}
 	sub sp, sp, #24
@@ -91,2 +89,4 @@
 	pop {lr}
 	mov pc, lr
+FUNCTION_END(__aeabi_uldivmod)
+