commit b076bb02ee2c489da36c89e35c640bfe45c7d27e
author Jeff Dike <jdike@addtoit.com> Fri Jul 14 00:24:03 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Jul 14 21:53:52 2006 -0700
tree 5bf5e59019b45b77f3db0cb0454a22cf71e89ac6
parent a5df0d1a2c0f7dbd135d978d02daf2d99e62ff7a

[PATCH] uml: tidy biarch gcc support

On top of the previous biarch changes for UML, this makes the preprocessor
changes a bit cleaner.  Specify the 64-bit build in CPPFLAGS on the x86_64
SUBARCH, rather than #undef'ing i386.  Compile-tested with i386 and x86_64
SUBARCHs.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/um/Makefile-x86_64

diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index dffd118..9558a7c 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -11,6 +11,7 @@
 CHECKFLAGS  += -m64
 AFLAGS += -m64
 LDFLAGS += -m elf_x86_64
+CPPFLAGS += -m64
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64