From: Ingo Molnar Date: Sat, 21 Mar 2020 08:23:40 +0000 (+0100) Subject: Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a4654e9bde4ecedb4921e6c8fe2088114bdff1b3;p=linux.git Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts Conflicts: arch/x86/purgatory/Makefile Signed-off-by: Ingo Molnar --- a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 diff --cc arch/x86/purgatory/Makefile index 69379bce9574c,54aadbb7e0b69..b04e6e72a592f --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@@ -14,12 -14,17 +14,18 @@@ $(obj)/sha256.o: $(srctree)/lib/crypto/ CFLAGS_sha256.o := -D__DISABLE_EXPORTS - LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib - targets += purgatory.ro - - # Sanitizer runtimes are unavailable and cannot be linked here. + # When linking purgatory.ro with -r unresolved symbols are not checked, + # also link a purgatory.chk binary without -r to check for unresolved symbols. + PURGATORY_LDFLAGS := -e purgatory_start -nostdlib -z nodefaultlib + LDFLAGS_purgatory.ro := -r $(PURGATORY_LDFLAGS) + LDFLAGS_purgatory.chk := $(PURGATORY_LDFLAGS) + targets += purgatory.ro purgatory.chk + + # Sanitizer, etc. runtimes are unavailable and cannot be linked here. + GCOV_PROFILE := n KASAN_SANITIZE := n + UBSAN_SANITIZE := n +KCSAN_SANITIZE := n KCOV_INSTRUMENT := n # These are adjustments to the compiler flags used for objects that