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

Timestamp:

2012-08-13T17:17:04Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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) (4 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
+        
+#if defined(LOADER) || defined(DLEXE)
+        .interp : {
+                *(.interp);
+        } :interp :text
+#endif
+        
+        /* Make sure the code is aligned reasonably */
+        . = ALIGN(., 16);
+        
         .init : {
                 *(.init);
@@ -37 +42 @@
                 *(.rodata .rodata.*);
         } :text
-
+        
 #if defined(SHLIB) || defined(DLEXE)
         .rel.plt : {
@@ -80 +85 @@
 #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