Changeset 4f5dc18 in mainline for uspace/srv/loader/arch/ia32/_link.ld.in

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 mainline.

File:

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

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

@@ -8 +8 @@
 PHDRS {
         interp PT_INTERP;
-        text PT_LOAD FILEHDR PHDRS FLAGS(5);
+        text PT_LOAD FILEHDR PHDRS FLAGS(5);
         data PT_LOAD FLAGS(6);
 }
@@ -16 +16 @@
                 *(.interp);
         } :interp
-
+        
         . = 0x70001000;
-
+        
         .init ALIGN(0x1000) : SUBALIGN(0x1000) {
                 *(.init);
         } :text
+        
         .text : {
                 *(.text);
-                *(.rodata*);
+                *(.rodata*);
         } :text
         
@@ -30 +31 @@
                 *(.data);
         } :data
+        
         .tdata : {
                 _tdata_start = .;
                 *(.tdata);
+                *(.gnu.linkonce.tb.*);
                 _tdata_end = .;
         } :data
+        
         .tbss : {
                 _tbss_start = .;
@@ -40 +44 @@
                 _tbss_end = .;
         } :data
+        
         _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+        
         .bss : {
-                *(COMMON);
-                *(.bss);
+                *(COMMON);
+                *(.bss);
         } :data
         
         . = ALIGN(0x1000);
+        
         _heap = .;
         
@@ -52 +59 @@
                 *(*);
         }
-
 }