summaryrefslogtreecommitdiff
path: root/arch/um/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-06-30 01:55:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 11:25:38 -0700
commitff23db5373f66a818c296f4d58adaaa10f515fd3 (patch)
tree46ac9d4e0cbee290324c8efc9bf389bd503c3b08 /arch/um/kernel/vmlinux.lds.S
parentd115ec0f0f094683dc2588818cb28134dd75e6d1 (diff)
[PATCH] uml: fix biarch gcc build on x86_64
I run an x86_64 kernel with i386 userspace (Ubuntu Dapper) and decided to try out UML today. I found that UML wasn't quite aware of biarch compilers (which Ubuntu i386 ships). A fix similar to what was done for x86_64 should probably be committed (see http://marc.theaimsgroup.com/?l=linux-kernel&m=113425940204010&w=2). Without the FLAGS changes, the build will fail at a number of places and without the LINK change, the final link will fail. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Sam Ravnborg <sam@ravnborg.org> 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, 2 insertions, 0 deletions
diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S
index 1660a769674b..0a7d50ff9a4c 100644
--- a/arch/um/kernel/vmlinux.lds.S
+++ b/arch/um/kernel/vmlinux.lds.S
@@ -1,4 +1,6 @@
#include <linux/config.h>
+/* in case the preprocessor is a 32bit one */
+#undef i386
#ifdef CONFIG_LD_SCRIPT_STATIC
#include "uml.lds.S"
#else