Changeset b5e68c8 in mainline for kernel/arch/ia64/_link.ld.in

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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:

• kernel/arch/ia64/_link.ld.in (modified) (3 diffs)

kernel/arch/ia64/_link.ld.in

@@ -16 +16 @@
                 ktext_start = .;
                 *(K_TEXT_START);
-                *(.text)
+                *(.text .text.*)
                 ktext_end = .;
                 
@@ -30 +30 @@
                 hardcoded_kdata_size = .;
                 QUAD(kdata_end - kdata_start);
+                __gp = .;
                 *(.got .got.*)
                 *(.sdata)
@@ -36 +37 @@
                 *(.bss)
                 *(COMMON);
-
+                
                 . = ALIGN(8);
-                symbol_table = .;
-                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
-
+                symbol_table = .;
+                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
+                
                 kdata_end = .;
         }
-
+        
         /DISCARD/ : {
                 *(*);
         }
-
 }