Changeset 8725fb4 in mainline for arch/amd64/_link.ld.in

Timestamp:

2006-01-08T18:11:20Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

46d26ee

Parents:

66def8d

Message:

break AMD64, will be fixed soon

File:

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

arch/amd64/_link.ld.in

@@ -13 +13 @@
 #include <arch/mm/page.h>
 
-ENTRY(kernel_image_start)
-
 SECTIONS {
-        .unmapped BOOTSTRAP_OFFSET: AT (BOOTSTRAP_OFFSET) {
+        .unmapped BOOT_OFFSET: AT (0) {
                 unmapped_ktext_start = .;
                 *(K_TEXT_START);
-                *(K_TEXT_START_2);
                 unmapped_ktext_end = .;
 
@@ -27 +24 @@
         }
 
-        .mapped (PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET)+SIZEOF(.unmapped)) : AT (BOOTSTRAP_OFFSET+SIZEOF(.unmapped)) {
+        .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)) : AT (SIZEOF(.unmapped)) {
                 ktext_start = .;
-                *(BOOT_DATA);
                 *(.text);
                 ktext_end = .;
@@ -37 +33 @@
                 *(.rodata*);            /* string literals */
                 hardcoded_load_address = .;
-                QUAD(PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET));
+                QUAD(PA2KA(BOOT_OFFSET));
                 hardcoded_ktext_size = .;
                 QUAD(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
@@ -57 +53 @@
                 kdata_end = .;
         }
-
-        _hardcoded_kernel_size = (ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start) + (kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start);
-
-        /* Symbols that need to be accessed both from real mode & long mode */
-        /* e820*_boot is real mode (pre-above-1MB-move), e820* is */
-        /* kernel mapped above-1MB-physical copied symbol */
-        e820table_boot = KA2PA(e820table) - BOOT_OFFSET;
-        e820counter_boot = KA2PA(e820counter) - BOOT_OFFSET;
-
-        /* real_bootstrap_gdtr is mapped real_bootstrap_gdtr_boot */
-        /* It is physically outside of kernel area, we have to access */
-        /* it after modification from long mode for booting */
-        /* SMP slave processors */
-        real_bootstrap_gdtr = PA2KA(real_bootstrap_gdtr_boot);
 }