Changeset efdfebc in mainline for uspace/lib/c/arch/ia32/_link.ld.in

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/ia32/_link.ld.in (modified) (5 diffs)

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

@@ -19 +19 @@
 
 SECTIONS {
-#if defined(LOADER) || defined(DLEXE)
-        .interp : {
-                *(.interp);
-        } :interp
-#endif
 #ifdef LOADER
         . = 0x70001000 + SIZEOF_HEADERS;
@@ -29 +24 @@
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
+        
         .init : {
                 *(.init);
@@ -37 +33 @@
                 *(.rodata .rodata.*);
         } :text
-
+        
 #if defined(SHLIB) || defined(DLEXE)
         .rel.plt : {
@@ -66 +62 @@
         } :text
 #endif
+        
+#if defined(LOADER) || defined(DLEXE)
+        .interp : {
+                *(.interp);
+        } :interp :text
+#endif
+        
         . = . + 0x1000;
         
@@ -80 +83 @@
 #if defined(SHLIB) || defined(DLEXE)
         .data.rel : {
-                *(.data.rel .data.rel.*);
+                *(.data.rel .data.rel.*);
         } :data
-
+        
         .got : {
-                *(.got);
+                *(.got);
         } :data
+        
         .got.plt : {
-                *(.got.plt);
+                *(.got.plt);
         } :data
 #endif