diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-05 10:36:59 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-05 10:36:59 +1100 |
| commit | c51e3a417bb0f295e13a5bad86302b5212eafdf3 (patch) | |
| tree | 3d60529b8bf1af4eee98bfede157518520fbb423 | |
| parent | 5ad570786158e327a1c5d32dd3d66f26d8de6340 (diff) | |
powerpc: Fix vmlinux.lds.S for 32-bit
We can't currently use asm-ppc/page.h in vmlinux.lds.S, so until
we have a merged page.h, define PAGE_SIZE and KERNELBASE locally.
Also gets rid of some dynamic executable cruft that we had for
32-bit. With -Ttext=$(KERNELBASE) this didn't cause any problem,
but when we changed to putting . = KERNELBASE in the vmlinux.lds.S
this cruft caused the text to get linked at 0xa0 instead of
0xc0000000. Oops.
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 9ceaa7a7bd0..7fa7b15fd8e 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -1,5 +1,10 @@ #include <linux/config.h> +#ifdef CONFIG_PPC64 #include <asm/page.h> +#else +#define PAGE_SIZE 4096 +#define KERNELBASE CONFIG_KERNEL_START +#endif #include <asm-generic/vmlinux.lds.h> ENTRY(_stext) @@ -22,31 +27,6 @@ SECTIONS . = KERNELBASE; /* Read-only sections, merged into text segment: */ -#ifdef CONFIG_PPC32 - . = + SIZEOF_HEADERS; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .rel.text : { *(.rel.text) } - .rela.text : { *(.rela.text) } - .rel.data : { *(.rel.data) } - .rela.data : { *(.rela.data) } - .rel.rodata : { *(.rel.rodata) } - .rela.rodata : { *(.rela.rodata) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } -/* .init : { *(.init) } =0*/ - .plt : { *(.plt) } -#endif .text : { *(.text .text.*) SCHED_TEXT |