summaryrefslogtreecommitdiff
path: root/arch/sparc64
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-07-08 00:30:35 +0400
committerDavid S. Miller <davem@davemloft.net>2008-07-18 08:39:11 +0400
commit9ae95bce73ef2d12fbe32a03ed230a9bef667328 (patch)
tree1940e5f657a012246225f8e47e0b0f37695307ae /arch/sparc64
parent597631f2eadc94a1c5109c639af1e575cf587d8b (diff)
downloadlinux-9ae95bce73ef2d12fbe32a03ed230a9bef667328.tar.xz
sparc: add -m64 when building vmlinux.lds
David Miller noticed that the build of vmlinux.lds failed to use the -m64 specifier. This caused the build to break with a bi-arch gcc with unified headers. Add the -m64 option to CPPFLAGS_vmlinux.lds so we have the correct defines available when building vmliux.lds. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
index 4b8f2b084c21..b785a395b12f 100644
--- a/arch/sparc64/Makefile
+++ b/arch/sparc64/Makefile
@@ -9,7 +9,9 @@
CHECKFLAGS += -D__sparc__ -D__sparc_v9__ -m64
-CPPFLAGS_vmlinux.lds += -Usparc
+# Undefine sparc when processing vmlinux.lds - it is used
+# And teach CPP we are doing 64 bit builds (for this case)
+CPPFLAGS_vmlinux.lds += -m64 -Usparc
LDFLAGS := -m elf64_sparc