[uml-devel] [PATCH 3/5] UML - Tidy biarch gcc support

[Jeff D. <jd...@ad...>]

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 <na...@us...>
Signed-off-by: Jeff Dike <jd...@ad...>

Index: linux-2.6.17/arch/um/Makefile-x86_64
===================================================================
--- linux-2.6.17.orig/arch/um/Makefile-x86_64	2006-07-12 11:26:41.000000000 -0400
+++ linux-2.6.17/arch/um/Makefile-x86_64	2006-07-12 11:32:52.000000000 -0400
@@ -11,6 +11,7 @@ USER_CFLAGS += -fno-builtin -m64
 CHECKFLAGS  += -m64
 AFLAGS += -m64
 LDFLAGS += -m elf_x86_64
+CPPFLAGS += -m64
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64
Index: linux-2.6.17/arch/um/kernel/vmlinux.lds.S
===================================================================
--- linux-2.6.17.orig/arch/um/kernel/vmlinux.lds.S	2006-07-12 11:26:41.000000000 -0400
+++ linux-2.6.17/arch/um/kernel/vmlinux.lds.S	2006-07-12 11:32:52.000000000 -0400
@@ -1,5 +1,3 @@
-/* in case the preprocessor is a 32bit one */
-#undef i386
 #ifdef CONFIG_LD_SCRIPT_STATIC
 #include "uml.lds.S"
 #else