aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-07-14 00:24:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-14 21:53:52 -0700
commitb076bb02ee2c489da36c89e35c640bfe45c7d27e (patch)
tree5bf5e59019b45b77f3db0cb0454a22cf71e89ac6 /arch/um/kernel/vmlinux.lds.S
parent[PATCH] uml: tidy longjmp macro (diff)
downloadlinux-dev-b076bb02ee2c489da36c89e35c640bfe45c7d27e.tar.xz
linux-dev-b076bb02ee2c489da36c89e35c640bfe45c7d27e.zip
[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>
Diffstat (limited to 'arch/um/kernel/vmlinux.lds.S')
-rw-r--r--arch/um/kernel/vmlinux.lds.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S
index 72acdce205e0..f8aeb448aab6 100644
--- a/arch/um/kernel/vmlinux.lds.S
+++ b/arch/um/kernel/vmlinux.lds.S
@@ -1,5 +1,3 @@
-/* in case the preprocessor is a 32bit one */
-#undef i386
#ifdef CONFIG_LD_SCRIPT_STATIC
#include "uml.lds.S"
#else