Changeset f2cb80a in mainline for kernel/arch/amd64/_link.ld.in

Timestamp:

2024-02-23T17:57:23Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/arch/amd64/_link.ld.in (modified) (1 diff)

kernel/arch/amd64/_link.ld.in

@@ -23 +23 @@
         }
 
-        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS + SIZEOF(.unmapped)) : AT (BOOT_OFFSET + SIZEOF_HEADERS + SIZEOF(.unmapped)) {
+        .text (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS + SIZEOF(.unmapped)) : AT (BOOT_OFFSET + SIZEOF_HEADERS + SIZEOF(.unmapped)) {
                 ktext_start = .;
                 *(.text .text.*);
                 ktext_end = .;
+        }
 
+        /* stack unwinding data */
+        .eh_frame_hdr : {
+                eh_frame_hdr_start = .;
+                *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*);
+                eh_frame_hdr_end = .;
+        }
+        .eh_frame : {
+                eh_frame_start = .;
+                KEEP(*(.eh_frame .eh_frame.*));
+                eh_frame_end = .;
+        }
+
+        .data : {
                 kdata_start = .;
-                *(.data .data.*);              /* initialized data */
-                *(.rodata .rodata.*);
-                *(.eh_frame .eh_frame.*);      /* stack unwinding data */
-                *(.eh_frame_hdr .eh_frame_hdr.*);
-                *(COMMON);      /* global variables */
+                *(.rodata .rodata.*);  /* read-only global variables */
+                *(.data .data.*);      /* non-zero initialized global variables */
 
-                /* bss can't be omitted from the ELF image. */
-                *(.bss .bss.*);        /* uninitialized static variables */
+                /*
+                 * When .bss is not physically present in the ELF file (MemSz > FileSz)
+                 * the kernel crashes during early boot. Not sure which part of the
+                 * boot process is to blame, for now just keep .bss packaged with .data
+                 * so that FileSz == MemSz.
+                 */
+
+                 *(.bss .bss.*);        /* uninitialized global variables */
+                *(COMMON);             /* non-`static` global variables without an extern declaration */
                 kdata_end = .;
         }