Changeset cc250b3 in mainline for uspace/lib/c/arch/amd64/_link.ld.in

Timestamp:

2012-09-06T12:31:05Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

504f1756

Parents:

ecd1a0a (diff), 8cf4823 (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/amd64/_link.ld.in (modified) (2 diffs)

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

@@ -16 +16 @@
 #ifdef LOADER
         . = 0x70001000 + SIZEOF_HEADERS;
-        
-        .interp : {
-                *(.interp);
-        } :interp :text
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 16);
         
         .init : {
@@ -35 +28 @@
                 *(.rodata .rodata.*);
         } :text
+        
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp :text
+#endif
         
         . = . + 0x1000;