summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 22:43:54 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:04:52 -0800
commitbb33421dde79f9a36d5485c56335ff178ac7d268 (patch)
treef4b8843d9295c1efb550e869352e578cb8667ce1 /arch/x86_64/kernel/vmlinux.lds.S
parent79c62cf1789f935280138b412bb750be84aec747 (diff)
[PATCH] x86_64: Allow compilation on a 32bit biarch toolchain
This might help on distributions that use a 32bit biarch compiler. First pass -m64 by default. Secondly add some more .code32s because at least the Ubuntu biarch 32bit as called by gcc doesn't seem to handle -m64 -m32 as generated by the Makefile without such assistance. And finally make sure the linker script can be preprocessed with a 32bit cpp. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/vmlinux.lds.S')
-rw-r--r--arch/x86_64/kernel/vmlinux.lds.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S
index 4cbbe7c4883..b0eed1faf74 100644
--- a/arch/x86_64/kernel/vmlinux.lds.S
+++ b/arch/x86_64/kernel/vmlinux.lds.S
@@ -8,6 +8,8 @@
#include <asm/page.h>
#include <linux/config.h>
+#undef i386 /* in case the preprocessor is a 32bit one */
+
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
OUTPUT_ARCH(i386:x86-64)
ENTRY(phys_startup_64)