diff options
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 |