Changeset d61c3a7 in mainline for uspace/lib/c/arch/ia64/_link.ld.in

Timestamp:

2011-05-15T14:44:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8d308b9

Parents:

010be476 (diff), e0f52bf (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/ia64/_link.ld.in (modified) (1 diff)

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

@@ -3 +3 @@
 
 PHDRS {
+#ifdef LOADER
+        interp PT_INTERP;
         text PT_LOAD FLAGS(5);
+#else
+        text PT_LOAD FLAGS(5);
+#endif
         data PT_LOAD FLAGS(6);
 }
 
 SECTIONS {
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp
+        
+        . = 0x800000000 + SIZEOF_HEADERS;
+#else
         . = 0x4000 + SIZEOF_HEADERS;
-        
+#endif
+        /*
+         * XXX This is just a work around. Problem: .init section does not
+         * have the proper alignment.
+         */
+        . = ALIGN(., 16);
+
         .init : {
                 *(.init);