summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-30 16:16:52 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-01 18:52:10 +1000
commitcabb558714945e92000f627dda562aa5e86a31af (patch)
tree595cd75dad072224041260afb220d7fce3164e53 /arch/powerpc/kernel/vmlinux.lds.S
parentbd142b70a6bd5522f7d95f0cec06091b93bb0715 (diff)
powerpc: make iSeries build
Merge vmlinux.lds.S. Also remove arch/powerpc/kernel/vmlinux.lds which is a generated file. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
-rw-r--r--arch/powerpc/kernel/vmlinux.lds.S190
1 files changed, 176 insertions, 14 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 09c6525cfa61..0587d9c4609d 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -1,10 +1,29 @@
+#include <linux/config.h>
+#ifdef CONFIG_PPC64
+#include <asm/page.h>
+#endif
#include <asm-generic/vmlinux.lds.h>
+#ifdef CONFIG_PPC64
+OUTPUT_ARCH(powerpc:common64)
+jiffies = jiffies_64;
+#else
OUTPUT_ARCH(powerpc:common)
jiffies = jiffies_64 + 4;
+#endif
SECTIONS
{
+ /* Sections to be discarded. */
+ /DISCARD/ : {
+ *(.exitcall.exit)
+#ifdef CONFIG_PPC32
+ *(.exit.data)
+#endif
+ }
+
+
/* Read-only sections, merged into text segment: */
+#ifdef CONFIG_PPC32
. = + SIZEOF_HEADERS;
.interp : { *(.interp) }
.hash : { *(.hash) }
@@ -28,17 +47,30 @@ SECTIONS
.rela.plt : { *(.rela.plt) }
/* .init : { *(.init) } =0*/
.plt : { *(.plt) }
- .text :
- {
+#endif
+ .text : {
+#ifdef CONFIG_PPC64
+ *(.text .text.*)
+#else
*(.text)
+#endif
SCHED_TEXT
LOCK_TEXT
+#ifdef CONFIG_PPC64
+ KPROBES_TEXT
+#endif
*(.fixup)
+#ifdef CONFIG_PPC32
*(.got1)
__got2_start = .;
*(.got2)
__got2_end = .;
+#else
+ . = ALIGN(PAGE_SIZE);
+ _etext = .;
+#endif
}
+#ifdef CONFIG_PPC32
_etext = .;
PROVIDE (etext = .);
@@ -48,6 +80,7 @@ SECTIONS
.dtors : { *(.dtors) }
.fixup : { *(.fixup) }
+#endif
__ex_table : {
__start___ex_table = .;
@@ -61,6 +94,17 @@ SECTIONS
__stop___bug_table = .;
}
+#ifdef CONFIG_PPC64
+ __ftr_fixup : {
+ __start___ftr_fixup = .;
+ *(__ftr_fixup)
+ __stop___ftr_fixup = .;
+ }
+
+ RODATA
+#endif
+
+#ifdef CONFIG_PPC32
/* Read-write section, merged into data segment: */
. = ALIGN(4096);
.data :
@@ -90,16 +134,25 @@ SECTIONS
.data.init_task : { *(.data.init_task) }
. = ALIGN(4096);
+#else
+ /* will be freed after init */
+ . = ALIGN(PAGE_SIZE);
+#endif
__init_begin = .;
.init.text : {
_sinittext = .;
*(.init.text)
_einittext = .;
}
+#ifdef CONFIG_PPC32
/* .exit.text is discarded at runtime, not link time,
to deal with references from __bug_table */
.exit.text : { *(.exit.text) }
+#endif
.init.data : {
+#ifdef CONFIG_PPC64
+ *(.init.data)
+#else
*(.init.data);
__vtop_table_begin = .;
*(.vtop_fixup);
@@ -107,13 +160,31 @@ SECTIONS
__ptov_table_begin = .;
*(.ptov_fixup);
__ptov_table_end = .;
+#endif
}
+
. = ALIGN(16);
+#ifdef CONFIG_PPC32
__setup_start = .;
- .init.setup : { *(.init.setup) }
+#endif
+ .init.setup : {
+#ifdef CONFIG_PPC64
+ __setup_start = .;
+#endif
+ *(.init.setup)
+#ifdef CONFIG_PPC64
+ __setup_end = .;
+#endif
+ }
+#ifdef CONFIG_PPC32
__setup_end = .;
+
__initcall_start = .;
+#endif
.initcall.init : {
+#ifdef CONFIG_PPC64
+ __initcall_start = .;
+#endif
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
@@ -121,27 +192,109 @@ SECTIONS
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
+#ifdef CONFIG_PPC64
+ __initcall_end = .;
+#endif
}
+#ifdef CONFIG_PPC32
__initcall_end = .;
__con_initcall_start = .;
- .con_initcall.init : { *(.con_initcall.init) }
+#endif
+ .con_initcall.init : {
+#ifdef CONFIG_PPC64
+ __con_initcall_start = .;
+#endif
+ *(.con_initcall.init)
+#ifdef CONFIG_PPC64
+ __con_initcall_end = .;
+#endif
+ }
+#ifdef CONFIG_PPC32
__con_initcall_end = .;
+#endif
SECURITY_INIT
+#ifdef CONFIG_PPC32
__start___ftr_fixup = .;
__ftr_fixup : { *(__ftr_fixup) }
__stop___ftr_fixup = .;
+#else
+ . = ALIGN(PAGE_SIZE);
+ .init.ramfs : {
+ __initramfs_start = .;
+ *(.init.ramfs)
+ __initramfs_end = .;
+ }
+#endif
+#ifdef CONFIG_PPC32
. = ALIGN(32);
__per_cpu_start = .;
- .data.percpu : { *(.data.percpu) }
+#endif
+ .data.percpu : {
+#ifdef CONFIG_PPC64
+ __per_cpu_start = .;
+#endif
+ *(.data.percpu)
+#ifdef CONFIG_PPC64
+ __per_cpu_end = .;
+#endif
+ }
+#ifdef CONFIG_PPC32
__per_cpu_end = .;
+#endif
+#ifdef CONFIG_PPC64
+ . = ALIGN(PAGE_SIZE);
+ . = ALIGN(16384);
+ __init_end = .;
+ /* freed after init ends here */
+
+
+ /* Read/write sections */
+ . = ALIGN(PAGE_SIZE);
+ . = ALIGN(16384);
+ /* The initial task and kernel stack */
+ .data.init_task : {
+ *(.data.init_task)
+ }
+
+ . = ALIGN(PAGE_SIZE);
+ .data.page_aligned : {
+ *(.data.page_aligned)
+ }
+
+ .data.cacheline_aligned : {
+ *(.data.cacheline_aligned)
+ }
+
+ .data : {
+ *(.data .data.rel* .toc1)
+ *(.branch_lt)
+ }
+
+ .opd : {
+ *(.opd)
+ }
+
+ .got : {
+ __toc_start = .;
+ *(.got)
+ *(.toc)
+ . = ALIGN(PAGE_SIZE);
+ _edata = .;
+ }
+
+
+ . = ALIGN(PAGE_SIZE);
+#else
. = ALIGN(4096);
__initramfs_start = .;
- .init.ramfs : { *(.init.ramfs) }
+ .init.ramfs : {
+ *(.init.ramfs)
+ }
__initramfs_end = .;
. = ALIGN(4096);
@@ -152,21 +305,30 @@ SECTIONS
_eextratext = .;
__bss_start = .;
- .bss :
- {
+#endif
+ .bss : {
+#ifdef CONFIG_PPC64
+ __bss_start = .;
+#else
*(.sbss) *(.scommon)
*(.dynbss)
+#endif
*(.bss)
+#ifdef CONFIG_PPC32
*(COMMON)
+#else
+ __bss_stop = .;
+#endif
}
+#ifdef CONFIG_PPC32
__bss_stop = .;
+#endif
+#ifdef CONFIG_PPC64
+ . = ALIGN(PAGE_SIZE);
+#endif
_end = . ;
+#ifdef CONFIG_PPC32
PROVIDE (end = .);
-
- /* Sections to be discarded. */
- /DISCARD/ : {
- *(.exitcall.exit)
- *(.exit.data)
- }
+#endif
}