Changeset 8b655705 in mainline for uspace/srv/loader/arch/arm32/_link.ld.in

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/arm32/_link.ld.in (modified) (5 diffs)

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

@@ -3 +3 @@
  * is the base address.
  */
+
 STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
@@ -16 +17 @@
                 *(.interp);
         } : interp
-
+        
         . = 0x70001000;
-
+        
         .init ALIGN(0x1000): SUBALIGN(0x1000) {
                 *(.init);
-        } : text
+        } :text
+        
         .text : {
-                *(.text);
-        *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         
@@ -32 +34 @@
                 *(.sdata);
         } :data
+        
         .tdata : {
                 _tdata_start = .;
@@ -37 +40 @@
                 _tdata_end = .;
         } :data
+        
         .tbss : {
                 _tbss_start = .;
@@ -42 +46 @@
                 _tbss_end = .;
         } :data
+        
         _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+        
         .bss : {
                 *(.sbss);
                 *(.scommon);
-        *(COMMON);
-        *(.bss);
+                *(COMMON);
+                *(.bss);
         } :data
-        
-        . = ALIGN(0x1000);
-        _heap = .;
         
         /DISCARD/ : {
                 *(*);
         }
-
 }