Changeset 15639ec in mainline

Timestamp:

2018-11-12T20:20:36Z (5 years ago)

Author:

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

Branches:

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

Children:

8781e9d, e394c196

Parents:

dd884cb

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-12 19:54:19)

git-committer:

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

Message:

Fix up x86 linker scripts a bit

Location:

kernel/arch

Files:

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

kernel/arch/amd64/_link.ld.in

@@ -15 +15 @@
         kernel_load_address = PA2KA(BOOT_OFFSET);
 
-        .unmapped BOOT_OFFSET: AT (0) {
+        .unmapped (BOOT_OFFSET + SIZEOF_HEADERS): AT (BOOT_OFFSET + SIZEOF_HEADERS) {
                 unmapped_start = .;
                 *(K_TEXT_START);
@@ -23 +23 @@
         }
 
-        .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)) : AT (SIZEOF(.unmapped)) {
+        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS + SIZEOF(.unmapped)) : AT (BOOT_OFFSET + SIZEOF_HEADERS + SIZEOF(.unmapped)) {
                 ktext_start = .;
                 *(.text .text.*);

kernel/arch/ia32/_link.ld.in

@@ -15 +15 @@
         kernel_load_address = PA2KA(BOOT_OFFSET);
 
-        .unmapped BOOT_OFFSET: AT (0) {
+        .unmapped (BOOT_OFFSET + SIZEOF_HEADERS): AT (BOOT_OFFSET + SIZEOF_HEADERS) {
                 unmapped_start = .;
                 *(K_TEXT_START);
@@ -22 +22 @@
         }
 
-        .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)): AT (SIZEOF(.unmapped)) {
+        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS + SIZEOF(.unmapped)): AT (BOOT_OFFSET + SIZEOF_HEADERS + SIZEOF(.unmapped)) {
                 ktext_start = .;
                 *(.text .text.*);