Changeset 04803bf in mainline for boot/arch/ia64/_link.ld.in

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• boot/arch/ia64/_link.ld.in (moved) (moved from boot/arch/ia64/loader/_link.ld.in ) (1 diff)

boot/arch/ia64/_link.ld.in

@@ -5 +5 @@
         .boot 0x4400000: AT (0x4400000) {
                 *(BOOTSTRAP);
-[[COMPONENTS]]          
-                . = ALIGN (16384);
                 *(.text);
+                *(.sdata);
+                *(.sdata2);
+                *(.sbss);
                 *(.rodata);
                 *(.rodata.*);
                 *(.data);               /* initialized data */
                 _got = . ;
-                *(.got .got.*);               
+                *(.got .got.*);
                 *(.bss);                /* uninitialized static variables */
                 *(COMMON);
+[[COMPONENTS]]
         }
 
-        .sboot : {
-                *(.sdata);
-                *(.sdata2);
-                *(.sbss);
-        }
-        
         /DISCARD/ : {
                 *(.comment);