diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-29 00:31:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:41:32 -0400 |
| commit | ca5cd877ae699e758e6f26efc11b01bf6631d427 (patch) | |
| tree | f2337ce76ab006d9705b10e8e0ed2f62487c837f /arch/um/Makefile-x86_64 | |
| parent | 2a397e82c7db18019e408f953dd58dc1963a328c (diff) | |
x86 merge fallout: uml
Don't undef __i386__/__x86_64__ in uml anymore, make sure that (few) places
that required adjusting the ifdefs got those.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/Makefile-x86_64')
| -rw-r--r-- | arch/um/Makefile-x86_64 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index fe5316f0c6a..8ed362f9358 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 | |||
| @@ -6,12 +6,9 @@ START := 0x60000000 | |||
| 6 | 6 | ||
| 7 | _extra_flags_ = -fno-builtin -m64 | 7 | _extra_flags_ = -fno-builtin -m64 |
| 8 | 8 | ||
| 9 | #We #undef __x86_64__ for kernelspace, not for userspace where | ||
| 10 | #it's needed for headers to work! | ||
| 11 | ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__ | ||
| 12 | KBUILD_CFLAGS += $(_extra_flags_) | 9 | KBUILD_CFLAGS += $(_extra_flags_) |
| 13 | 10 | ||
| 14 | CHECKFLAGS += -m64 | 11 | CHECKFLAGS += -m64 -D__x86_64__ |
| 15 | KBUILD_AFLAGS += -m64 | 12 | KBUILD_AFLAGS += -m64 |
| 16 | LDFLAGS += -m elf_x86_64 | 13 | LDFLAGS += -m elf_x86_64 |
| 17 | KBUILD_CPPFLAGS += -m64 | 14 | KBUILD_CPPFLAGS += -m64 |