Changeset 33ef2f2 in mainline

Timestamp:

2018-11-13T20:22:20Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Parents:

948e85b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-24 15:23:01)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:22:20)

Message:

Reduce differences between amd64 and ia32 ldscripts

File:

• kernel/arch/amd64/_link.ld.in (modified) (2 diffs)

kernel/arch/amd64/_link.ld.in

@@ -23 +23 @@
         kernel_load_address = PA2KA(BOOT_OFFSET);
 
-        .ap_bootstrap (AP_BOOT_OFFSET): AT (AP_BOOT_OFFSET) {
-                ap_bootstrap_start = .;
+        . = AP_BOOT_OFFSET + SIZEOF_HEADERS;
 
-                /* Must be first. */
-                *(.multiboot);
+        /* Must be first. */
+        .multiboot : { *(.multiboot); } :ap_boot
 
+        ap_bootstrap_start = .;
+
+        .ap_bootstrap : {
                 *(K_AP_TEXT_START);
                 *(K_AP_DATA_START);
-                ap_bootstrap_end = .;
         } :ap_boot
 
-        .unmapped (BOOT_OFFSET): AT (BOOT_OFFSET) {
-                unmapped_start = .;
+        ap_bootstrap_end = .;
+
+        . = BOOT_OFFSET + (ap_bootstrap_end & (PAGE_SIZE-1));
+        unmapped_start = .;
+
+        .unmapped : {
                 *(K_TEXT_START);
                 *(K_DATA_START);
                 *(K_INI_PTLS);
-                unmapped_end = .;
         } :unmapped
+
+        unmapped_file_end = .;
 
         .unmapped_bss : {
                 *(.bootstack);
+                *(K_BSS_START);
         } :unmapped
 
-        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF(.unmapped) + SIZEOF(.unmapped_bss)) : AT (BOOT_OFFSET + SIZEOF(.unmapped) + SIZEOF(.unmapped_bss)) {
+        unmapped_end = .;
+        mapped_load_start = ALIGN(PAGE_SIZE) + (unmapped_file_end & (PAGE_SIZE-1));
+
+        .mapped (PA2KA(mapped_load_start)): AT (mapped_load_start) {
                 ktext_start = .;
                 *(.text .text.*);
@@ -52 +62 @@
 
                 kdata_start = .;
-                *(.data);              /* initialized data */
-                *(.rodata .rodata.*);  /* string literals */
-                *(COMMON);      /* global variables */
+                *(.data);               /* initialized data */
+                *(.rodata .rodata.*);   /* string literals */
+                *(COMMON);              /* global variables */
 
                 /* bss can't be omitted from the ELF image. */
-                *(.bss);        /* uninitialized static variables */
+                *(.bss);                /* uninitialized static variables */
 
                 . = ALIGN(8);
                 symbol_table = .;
-                *(symtab.*);    /* Symbol table, must be LAST symbol!*/
-
+                *(symtab.*);            /* Symbol table, must be LAST symbol! */
                 kdata_end = .;
         } :mapped