summaryrefslogtreecommitdiff
path: root/arch/x86_64/Makefile
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/Makefile
parent79c62cf1789f935280138b412bb750be84aec747 (diff)
downloadlinux-3.10-bb33421dde79f9a36d5485c56335ff178ac7d268.tar.gz
linux-3.10-bb33421dde79f9a36d5485c56335ff178ac7d268.tar.bz2
linux-3.10-bb33421dde79f9a36d5485c56335ff178ac7d268.zip
[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/Makefile')
-rw-r--r--arch/x86_64/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 2d3e9be229c..d7fd46479c5 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -31,6 +31,7 @@ cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
CFLAGS += $(cflags-y)
+CFLAGS += -m64
CFLAGS += -mno-red-zone
CFLAGS += -mcmodel=kernel
CFLAGS += -pipe
@@ -52,6 +53,8 @@ CFLAGS += $(call cc-option,-funit-at-a-time)
# prevent gcc from generating any FP code by mistake
CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
+AFLAGS += -m64
+
head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o
libs-y += arch/x86_64/lib/