| From 270f3238584a398dd5fe474f49fbb5ff37a683b4 Mon Sep 17 00:00:00 2001 |
| From: Jouni Hogander <jouni.hogander@unikie.com> |
| Date: Mon, 9 Dec 2019 14:37:07 +0200 |
| Subject: [PATCH] MIPS: Prevent link failure with kcov instrumentation |
| |
| commit a4a3893114a41e365274d5fab5d9ff5acc235ff0 upstream. |
| |
| __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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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 |
| |
| -- |
| 2.7.4 |
| |
