Changeset 3b0f1b9a in mainline for kernel/arch/amd64/src/boot/multiboot.S

Timestamp:

2016-04-12T05:57:00Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0f792c28, d84398a7

Parents:

8844e70

Message:

amd64: use asmtool.h macros for defining symbols

File:

• kernel/arch/amd64/src/boot/multiboot.S (modified) (5 diffs)

kernel/arch/amd64/src/boot/multiboot.S

@@ -29 +29 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
@@ -64 +65 @@
 
 .align 4
-.global multiboot_image_start
 multiboot_header:
         .long MULTIBOOT_HEADER_MAGIC
@@ -75 +75 @@
         .long multiboot_image_start
 
-multiboot_image_start:
+SYMBOL(multiboot_image_start)
         cli
         cld
@@ -640 +640 @@
 
 .align 4096
-.global ptl_0
-ptl_0:
+SYMBOL(ptl_0)
         .quad ptl_1 + (PTL_WRITABLE | PTL_PRESENT)
         .fill 510, 8, 0
@@ -648 +647 @@
 .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