Index: kernel/arch/amd64/src/boot/multiboot.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot.S	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ kernel/arch/amd64/src/boot/multiboot.S	(revision dc0d8b52826b8cb72258c5c945e82004187e62ac)
@@ -29,4 +29,5 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
@@ -64,5 +65,4 @@
 
 .align 4
-.global multiboot_image_start
 multiboot_header:
 	.long MULTIBOOT_HEADER_MAGIC
@@ -75,5 +75,5 @@
 	.long multiboot_image_start
 
-multiboot_image_start:
+SYMBOL(multiboot_image_start)
 	cli
 	cld
@@ -640,6 +640,5 @@
 
 .align 4096
-.global ptl_0
-ptl_0:
+SYMBOL(ptl_0)
 	.quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
 	.fill 510, 8, 0
@@ -648,20 +647,16 @@
 .section K_DATA_START, "aw", @progbits
 
-.global bootstrap_idtr
-bootstrap_idtr:
+SYMBOL(bootstrap_idtr)
 	.word 0
 	.long 0
 
-.global bootstrap_gdtr
-bootstrap_gdtr:
+SYMBOL(bootstrap_gdtr)
 	.word GDT_SELECTOR(GDT_ITEMS)
 	.long KA2PA(gdt)
 
-.global multiboot_eax
-multiboot_eax:
+SYMBOL(multiboot_eax)
 	.long 0
 
-.global multiboot_ebx
-multiboot_ebx:
+SYMBOL(multiboot_ebx)
 	.long 0
 
Index: kernel/arch/amd64/src/boot/multiboot2.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot2.S	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ kernel/arch/amd64/src/boot/multiboot2.S	(revision dc0d8b52826b8cb72258c5c945e82004187e62ac)
@@ -27,4 +27,5 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
@@ -41,5 +42,4 @@
 
 .align 8
-.global multiboot2_image_start
 multiboot2_header_start:
 	.long MULTIBOOT2_HEADER_MAGIC
@@ -122,5 +122,5 @@
 multiboot2_header_end:
 
-multiboot2_image_start:
+SYMBOL(multiboot2_image_start)
 	cli
 	cld