Changeset b5e68c8 in mainline for uspace/lib/c/arch/arm32/_link.ld.in

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/lib/c/arch/arm32/_link.ld.in (modified) (3 diffs)

uspace/lib/c/arch/arm32/_link.ld.in

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+#else
         text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
+#else
         . = 0x1000 + SIZEOF_HEADERS;
-
+#endif
         .init : {
                 *(.init);
-        } : text
+        } :text
+        
         .text : {
-                *(.text);
-        *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
-
+        
         . = . + 0x1000;
-
+        
         .data : {
                 *(.opd);
@@ -25 +38 @@
                 *(.sdata);
         } :data
+        
         .tdata : {
                 _tdata_start = .;
@@ -33 +47 @@
                 _tbss_end = .;
         } :data
+        
         _tls_alignment = ALIGNOF(.tdata);
+        
         .bss : {
                 *(.sbss);
                 *(.scommon);
-        *(COMMON);
-        *(.bss);
+                *(COMMON);
+                *(.bss);
         } :data
-        
-        . = ALIGN(0x1000);
-        _heap = .;
         
         /DISCARD/ : {
                 *(*);
         }
-
 }