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

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/lib/c/arch/ia64/_link.ld.in (modified) (2 diffs)

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

@@ -14 +14 @@
 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.
-         */
+        
+        /* Workaround proper alignment of the .init section */
         . = ALIGN(., 16);
-
+        
         .init : {
                 *(.init);
@@ -36 +30 @@
                 *(.rodata .rodata.*);
         } :text
+        
+#ifdef LOADER
+        .interp : {
+                *(.interp);
+        } :interp :text
+#endif
         
         . = . + 0x4000;