Changeset bd48f4c in mainline for kernel/arch/amd64/_link.ld.in

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/amd64/_link.ld.in (modified) (4 diffs)

kernel/arch/amd64/_link.ld.in

@@ -1 +1 @@
 /** AMD64 linker script
- *  
+ *
  * umapped section:
- *      kernel text
- *      kernel data
+ *  kernel text
+ *  kernel data
  * mapped section:
- *      kernel text
- *      kernel data 
+ *  kernel text
+ *  kernel data
  */
 
@@ -17 +17 @@
                 *(K_TEXT_START);
                 unmapped_ktext_end = .;
-
+                
                 unmapped_kdata_start = .;
                 *(K_DATA_START);
@@ -23 +23 @@
                 unmapped_kdata_end = .;
         }
-
+        
         .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)) : AT (SIZEOF(.unmapped)) {
                 ktext_start = .;
                 *(.text);
                 ktext_end = .;
-
+                
                 kdata_start = .;
-                *(.data);               /* initialized data */
-                *(.rodata*);            /* string literals */
+                *(.data);       /* initialized data */
+                *(.rodata*);    /* string literals */
                 hardcoded_load_address = .;
                 QUAD(PA2KA(BOOT_OFFSET));
@@ -42 +42 @@
                 hardcoded_unmapped_kdata_size = .;
                 QUAD(unmapped_kdata_end - unmapped_kdata_start);
-                *(COMMON);              /* global variables */
-
+                *(COMMON);      /* global variables */
+                
                 . = ALIGN(8);
                 symbol_table = .;
-                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
-
-                *(.bss);                /* uninitialized static variables */
-
+                *(symtab.*);    /* Symbol table, must be LAST symbol!*/
+                
+                *(.bss);        /* uninitialized static variables */
+                
                 kdata_end = .;
         }
-
+        
         /DISCARD/ : {
                 *(*);
         }
         
-#ifdef CONFIG_SMP       
+#ifdef CONFIG_SMP
         _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
         ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;
         ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;
         protected_ap_gdtr = PA2KA(ap_gdtr);
-
 #endif /* CONFIG_SMP */
-
+        
 }