Changeset 5f70118 in mainline for kernel/arch/ia64/_link.ld.in

Timestamp:

2010-01-10T12:16:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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) (4 diffs)

kernel/arch/ia64/_link.ld.in

@@ -7 +7 @@
  */
 
+#define LOAD_ADDRESS_V  0xe000000004404000
+#define LOAD_ADDRESS_P  0x0000000004404000
+
 ENTRY(kernel_image_start)
 
 SECTIONS {
-        .image 0xe000000004404000: AT (0x0000000004404000) { 
+        .image LOAD_ADDRESS_V: AT (LOAD_ADDRESS_P) {
                 ktext_start = .;
                 *(K_TEXT_START);
@@ -21 +24 @@
                 *(.opd)
                 *(.data .data.*)
+                hardcoded_load_address = .;
+                QUAD(LOAD_ADDRESS_V);
+                hardcoded_ktext_size = .;
+                QUAD(ktext_end - ktext_start);
+                hardcoded_kdata_size = .;
+                QUAD(kdata_end - kdata_start);
                 *(.got .got.*)
                 *(.sdata)
@@ -28 +37 @@
                 *(COMMON);
 
+                . = ALIGN(8);
                 symbol_table = .;
                 *(symtab.*);            /* Symbol table, must be LAST symbol!*/
@@ -38 +48 @@
         }
 
-        _hardcoded_ktext_size = ktext_end - ktext_start;
-        _hardcoded_kdata_size = kdata_end - kdata_start;
-        _hardcoded_load_address = 0xe000000004404000;
-
 }