Changeset c4fb95d3 in mainline for uspace/lib/c/arch/mips32/_link.ld.in

Timestamp:

2011-02-18T20:04:56Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d011038

Parents:

87e373b (diff), 8b1ea2d4 (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/mips32/_link.ld.in (modified) (1 diff)

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

@@ -13 +13 @@
                 *(.init);
         } :text
+        
         .text : {
-                *(.text);
+                *(.text);
                 *(.rodata*);
         } :text
-
+        
         . = . + 0x4000;
-
+        
         .data : {
                 *(.data);
                 *(.data.rel*);
         } :data
-
+        
         .got : {
                 _gp = .;
                 *(.got);
         } :data
-
+        
         .tdata : {
                 _tdata_start = .;
                 *(.tdata);
                 _tdata_end = .;
+        } :data
+        
+        .tbss : {
                 _tbss_start = .;
                 *(.tbss);
                 _tbss_end = .;
         } :data
-        _tls_alignment = ALIGNOF(.tdata);
-
+        
+        _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+        
         .sbss : {
                 *(.scommon);
                 *(.sbss);
-        }       
+        }
+        
         .bss : {
                 *(.bss);
                 *(COMMON);
         } :data
-
-        . = ALIGN(0x4000);
-        _heap = .;
-
+        
         /DISCARD/ : {
                 *(*);