diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-06-30 04:55:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 14:25:38 -0400 |
| commit | ff23db5373f66a818c296f4d58adaaa10f515fd3 (patch) | |
| tree | 46ac9d4e0cbee290324c8efc9bf389bd503c3b08 /arch/um/kernel/vmlinux.lds.S | |
| parent | d115ec0f0f094683dc2588818cb28134dd75e6d1 (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.S | 2 |
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 @@ | |||
| 1 | #include <linux/config.h> | 1 | #include <linux/config.h> |
| 2 | /* in case the preprocessor is a 32bit one */ | ||
| 3 | #undef i386 | ||
| 2 | #ifdef CONFIG_LD_SCRIPT_STATIC | 4 | #ifdef CONFIG_LD_SCRIPT_STATIC |
| 3 | #include "uml.lds.S" | 5 | #include "uml.lds.S" |
| 4 | #else | 6 | #else |