diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
| commit | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch) | |
| tree | 42a0c0408fcf76024eb6885a27d4f1ed0228abcf /arch/um/Makefile-x86_64 | |
| parent | ce625a801664d8ed7344117bbb57510e4e0e872c (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'arch/um/Makefile-x86_64')
| -rw-r--r-- | arch/um/Makefile-x86_64 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index d80bd0052e6b..aa2f7174ebca 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 | |||
| @@ -1,11 +1,13 @@ | |||
| 1 | # Copyright 2003 - 2004 Pathscale, Inc | 1 | # Copyright 2003 - 2004 Pathscale, Inc |
| 2 | # Released under the GPL | 2 | # Released under the GPL |
| 3 | 3 | ||
| 4 | SUBARCH_LIBS := arch/um/sys-x86_64/ | 4 | libs-y += arch/um/sys-x86_64/ |
| 5 | START := 0x60000000 | 5 | START := 0x60000000 |
| 6 | 6 | ||
| 7 | #We #undef __x86_64__ for kernelspace, not for userspace where | ||
| 8 | #it's needed for headers to work! | ||
| 7 | CFLAGS += -U__$(SUBARCH)__ -fno-builtin $(STUB_CFLAGS) | 9 | CFLAGS += -U__$(SUBARCH)__ -fno-builtin $(STUB_CFLAGS) |
| 8 | ARCH_USER_CFLAGS := -D__x86_64__ | 10 | USER_CFLAGS += -fno-builtin |
| 9 | 11 | ||
| 10 | ELF_ARCH := i386:x86-64 | 12 | ELF_ARCH := i386:x86-64 |
| 11 | ELF_FORMAT := elf64-x86-64 | 13 | ELF_FORMAT := elf64-x86-64 |