summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJouni Hogander <jouni.hogander@unikie.com>2019-12-09 14:37:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-17 19:47:15 +0100
commit4c9544c0bd25609a0ebde5e22067d52d2fb26f7d (patch)
tree4f17997fd912a9c04734a0ce6bec60ba1f385c35
parent60af5786db7ebc2431a4f477da3e56b2cf2a8ca5 (diff)
downloadlinux-rt-4c9544c0bd25609a0ebde5e22067d52d2fb26f7d.tar.gz
MIPS: Prevent link failure with kcov instrumentation
[ Upstream commit a4a3893114a41e365274d5fab5d9ff5acc235ff0 ] __sanitizer_cov_trace_pc() is not linked in and causing link failure if KCOV_INSTRUMENT is enabled. Fix this by disabling instrumentation for compressed image. Signed-off-by: Jouni Hogander <jouni.hogander@unikie.com> Signed-off-by: Paul Burton <paulburton@kernel.org> Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com> Cc: linux-mips@vger.kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/mips/boot/compressed/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 172801ed35b8..d859f079b771 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -29,6 +29,9 @@ KBUILD_AFLAGS := $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
-DKERNEL_ENTRY=$(VMLINUX_ENTRY_ADDRESS)
+# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
+KCOV_INSTRUMENT := n
+
# decompressor objects (linked with vmlinuz)
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o