diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/um/Makefile-x86_64 | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/um/Makefile-x86_64')
| -rw-r--r-- | arch/um/Makefile-x86_64 | 1 |
1 files changed, 1 insertions, 0 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 |