Changeset 89c57b6 in mainline for uspace/srv/loader/arch/ia32/_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:

• uspace/srv/loader/arch/ia32/_link.ld.in (modified) (4 diffs)

uspace/srv/loader/arch/ia32/_link.ld.in

@@ -3 +3 @@
  * is the base address and the special interp section.
  */
+
 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
@@ -10 +11 @@
         text PT_LOAD FILEHDR PHDRS FLAGS(5);
         data PT_LOAD FLAGS(6);
+        debug PT_NOTE;
 }
 
@@ -24 +26 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         
@@ -52 +54 @@
         } :data
         
-        . = ALIGN(0x1000);
-        
-        _heap = .;
+#ifdef CONFIG_LINE_DEBUG
+        .comment 0 : { *(.comment); } :debug
+        .debug_abbrev 0 : { *(.debug_abbrev); } :debug
+        .debug_aranges 0 : { *(.debug_aranges); } :debug
+        .debug_info 0 : { *(.debug_info); } :debug
+        .debug_line 0 : { *(.debug_line); } :debug
+        .debug_loc 0 : { *(.debug_loc); } :debug
+        .debug_pubnames 0 : { *(.debug_pubnames); } :debug
+        .debug_pubtypes 0 : { *(.debug_pubtypes); } :debug
+        .debug_ranges 0 : { *(.debug_ranges); } :debug
+        .debug_str 0 : { *(.debug_str); } :debug
+#endif
         
         /DISCARD/ : {