diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-07-14 03:24:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-15 00:53:52 -0400 |
| commit | b076bb02ee2c489da36c89e35c640bfe45c7d27e (patch) | |
| tree | 5bf5e59019b45b77f3db0cb0454a22cf71e89ac6 /arch | |
| parent | a5df0d1a2c0f7dbd135d978d02daf2d99e62ff7a (diff) | |
[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')
| -rw-r--r-- | arch/um/Makefile-x86_64 | 1 | ||||
| -rw-r--r-- | arch/um/kernel/vmlinux.lds.S | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index dffd1184c956..9558a7cf34d5 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 | |||
| @@ -11,6 +11,7 @@ USER_CFLAGS += -fno-builtin -m64 | |||
| 11 | CHECKFLAGS += -m64 | 11 | CHECKFLAGS += -m64 |
| 12 | AFLAGS += -m64 | 12 | AFLAGS += -m64 |
| 13 | LDFLAGS += -m elf_x86_64 | 13 | LDFLAGS += -m elf_x86_64 |
| 14 | CPPFLAGS += -m64 | ||
| 14 | 15 | ||
| 15 | ELF_ARCH := i386:x86-64 | 16 | ELF_ARCH := i386:x86-64 |
| 16 | ELF_FORMAT := elf64-x86-64 | 17 | ELF_FORMAT := elf64-x86-64 |
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 @@ | |||
| 1 | /* in case the preprocessor is a 32bit one */ | ||
| 2 | #undef i386 | ||
| 3 | #ifdef CONFIG_LD_SCRIPT_STATIC | 1 | #ifdef CONFIG_LD_SCRIPT_STATIC |
| 4 | #include "uml.lds.S" | 2 | #include "uml.lds.S" |
| 5 | #else | 3 | #else |