diff options
| author |  Kees Cook <keescook@chromium.org>
| 2019-04-04 14:40:27 -0700 |
|---|---|---|
| committer |  Borislav Petkov <bp@suse.de>
| 2019-04-05 12:34:35 +0200 |
| commit | 7c21383f3429dd70da39c0c7f1efa12377a47ab6 (patch) | |
| tree | c1f1c89136f11733d34d45fd3d00f9949de7bca6 /arch/x86 | |
| parent | Linux 5.1-rc3 (diff) | |
| download | linux-7c21383f3429dd70da39c0c7f1efa12377a47ab6.tar.gz linux-7c21383f3429dd70da39c0c7f1efa12377a47ab6.tar.bz2 linux-7c21383f3429dd70da39c0c7f1efa12377a47ab6.zip | |
x86/build: Keep local relocations with ld.lld
The LLVM linker (ld.lld) defaults to removing local relocations, which
causes KASLR boot failures. ld.bfd and ld.gold already handle this
correctly. This adds the explicit instruction "--discard-none" during
the link phase. There is no change in output for ld.bfd and ld.gold,
but ld.lld now produces an image with all the needed relocations.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: clang-built-linux@googlegroups.com
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190404214027.GA7324@beast
Link: https://github.com/ClangBuiltLinux/linux/issues/404
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index a587805c6687..56e748a7679f 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -47,7 +47,7 @@ export REALMODE_CFLAGS export BITS ifdef CONFIG_X86_NEED_RELOCS - LDFLAGS_vmlinux := --emit-relocs + LDFLAGS_vmlinux := --emit-relocs --discard-none endif # |