Changes in kernel/arch/amd64/_link.ld.in [15639ec:6677acb] in mainline

File:

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

kernel/arch/amd64/_link.ld.in

@@ -17 +17 @@
         .unmapped (BOOT_OFFSET + SIZEOF_HEADERS): AT (BOOT_OFFSET + SIZEOF_HEADERS) {
                 unmapped_start = .;
-                *(K_TEXT_START);
-                *(K_DATA_START);
-                *(K_INI_PTLS);
+                KEEP(*(K_TEXT_START));
+                KEEP(*(K_DATA_START));
+                KEEP(*(K_INI_PTLS));
                 unmapped_end = .;
         }
 
-        .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);              /* initialized data */
-                *(.rodata .rodata.*);  /* string literals */
-                *(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);        /* 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.
+                 */
 
-                . = ALIGN(8);
-                symbol_table = .;
-                *(symtab.*);    /* Symbol table, must be LAST symbol!*/
-
+                 *(.bss .bss.*);        /* uninitialized global variables */
+                *(COMMON);             /* non-`static` global variables without an extern declaration */
                 kdata_end = .;
         }
 
-#ifdef CONFIG_LINE_DEBUG
         .comment 0 : { *(.comment); }
         .debug_abbrev 0 : { *(.debug_abbrev); }
+        .debug_abbrev.dwo 0 : { *(      .debug_abbrev.dwo); }
+        .debug_addr 0 : { *(.debug_addr); }
         .debug_aranges 0 : { *(.debug_aranges); }
+        .debug_cu_index 0 : { *(.debug_cu_index); }
+        .debug_frame 0 : { *(.debug_frame); }
+        .debug_frame_hdr 0 : { *(.debug_frame_hdr); }
         .debug_info 0 : { *(.debug_info); }
+        .debug_info.dwo 0 : { *(.debug_info.dwo); }
         .debug_line 0 : { *(.debug_line); }
+        .debug_line.dwo 0 : { *(.debug_line.dwo); }
+        .debug_line_str 0 : { *(.debug_line_str); }
         .debug_loc 0 : { *(.debug_loc); }
+        .debug_loclists 0 : { *(.debug_loclists); }
+        .debug_loclists.dwo 0 : { *(.debug_loclists.dwo); }
+        .debug_macinfo 0 : { *(.debug_macinfo); }
+        .debug_macro 0 : { *(.debug_macro); }
+        .debug_macro.dwo 0 : { *(.debug_macro.dwo); }
+        .debug_names 0 : { *(.debug_names); }
         .debug_pubnames 0 : { *(.debug_pubnames); }
         .debug_pubtypes 0 : { *(.debug_pubtypes); }
         .debug_ranges 0 : { *(.debug_ranges); }
+        .debug_rnglists 0 : { *(.debug_rnglists); }
         .debug_str 0 : { *(.debug_str); }
-#endif
+        .debug_str.dwo 0 : { *(.debug_str.dwo); }
+        .debug_str_offsets 0 : { *(.debug_str_offsets); }
+        .debug_str_offsets.dwo 0 : { *(.debug_str_offsets.dwo); }
+        .debug_tu_index 0 : { *(.debug_tu_index); }
+        .debug_types 0 : { *(.debug_types); }
 
         /DISCARD/ : {