Changeset 89c57b6 in mainline for kernel/arch/amd64/_link.ld.in

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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.

Message:

Merge mainline changes.

File:

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

kernel/arch/amd64/_link.ld.in

@@ -26 +26 @@
         .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)) : AT (SIZEOF(.unmapped)) {
                 ktext_start = .;
-                *(.text);
+                *(.text .text.*);
                 ktext_end = .;
                 
                 kdata_start = .;
-                *(.data);       /* initialized data */
-                *(.rodata*);    /* string literals */
+                *(.data);              /* initialized data */
+                *(.rodata .rodata.*);  /* string literals */
                 hardcoded_load_address = .;
                 QUAD(PA2KA(BOOT_OFFSET));
@@ -53 +53 @@
         }
         
+#ifdef CONFIG_LINE_DEBUG
+        .comment 0 : { *(.comment); }
+        .debug_abbrev 0 : { *(.debug_abbrev); }
+        .debug_aranges 0 : { *(.debug_aranges); }
+        .debug_info 0 : { *(.debug_info); }
+        .debug_line 0 : { *(.debug_line); }
+        .debug_loc 0 : { *(.debug_loc); }
+        .debug_pubnames 0 : { *(.debug_pubnames); }
+        .debug_pubtypes 0 : { *(.debug_pubtypes); }
+        .debug_ranges 0 : { *(.debug_ranges); }
+        .debug_str 0 : { *(.debug_str); }
+#endif
+        
         /DISCARD/ : {
                 *(*);