From 7f93a7667d813f1e10fd70ae44a1733f06f8ae9a Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Mon, 7 Jul 2008 22:30:35 +0200
Subject: [PATCH] --- yaml --- r: 104143 b: refs/heads/master c:
 9ae95bce73ef2d12fbe32a03ed230a9bef667328 h: refs/heads/master i:   104141:
 4bd58a0bcb2d75f995fc8d0d560349fd7bae2718   104139:
 33b5c807d25232d358e543a0150f101375381310   104135:
 ed3024577a069ef2bff47085a2f54d2ebf41f8fa   104127:
 aa3c63af1b2cda3b6004cf635381b1ada6ca2a9d v: v3

---
 [refs]                      | 2 +-
 trunk/arch/sparc64/Makefile | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 79573b2165b8..1d7b25112d64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 597631f2eadc94a1c5109c639af1e575cf587d8b
+refs/heads/master: 9ae95bce73ef2d12fbe32a03ed230a9bef667328
diff --git a/trunk/arch/sparc64/Makefile b/trunk/arch/sparc64/Makefile
index 4b8f2b084c21..b785a395b12f 100644
--- a/trunk/arch/sparc64/Makefile
+++ b/trunk/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