Changeset 19a1800 in mainline for uspace/srv/loader/arch/amd64/_link.ld.in

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 with the current development

File:

• uspace/srv/loader/arch/amd64/_link.ld.in (modified) (7 diffs)

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

@@ +1 @@
+/*
+ * The difference from _link.ld.in for regular statically-linked apps
+ * is the base address and the special interp section.
+ */
+
 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
@@ -6 +11 @@
         text PT_LOAD FLAGS(5);
         data PT_LOAD FLAGS(6);
+        debug PT_NOTE;
 }
 
@@ -11 +17 @@
         .interp : {
                 *(.interp);
-        } : interp
-
-        /* . = 0x0000700000001000;*/
+        } :interp
+        
+        /* . = 0x0000700000001000; */
         . = 0x70001000;
         
@@ -19 +25 @@
                 *(.init);
         } :text
+        
         .text : {
                 *(.text);
@@ -27 +34 @@
                 *(.data);
         } :data
+        
         .tdata : {
                 _tdata_start = .;
@@ -32 +40 @@
                 _tdata_end = .;
         } :data
+        
         .tbss : {
                 _tbss_start = .;
@@ -37 +46 @@
                 _tbss_end = .;
         } :data
+        
         _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+        
         .bss : {
                 *(COMMON);
                 *(.bss);
         } :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/ : {
                 *(*);
         }
-
 }