diff mbox series

MIPS: Prevent link failure with kcov instrumentation

Message ID 20191209123707.19693-1-jouni.hogander@unikie.com (mailing list archive)
State Mainlined
Commit a4a3893114a41e365274d5fab5d9ff5acc235ff0
Delegated to: Paul Burton
Headers show
Series MIPS: Prevent link failure with kcov instrumentation | expand

Commit Message

jouni.hogander@unikie.com Dec. 9, 2019, 12:37 p.m. UTC 
From: Jouni Hogander <jouni.hogander@unikie.com>

__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.

Cc: Paul Burton <paulburton@kernel.org>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>

Signed-off-by: Jouni Hogander <jouni.hogander@unikie.com>
---
 arch/mips/boot/compressed/Makefile | 3 +++
 1 file changed, 3 insertions(+)

Comments

Paul Burton Dec. 9, 2019, 6:48 p.m. UTC | #1 
Hello,

jouni.hogander@unikie.com wrote:
> From: Jouni Hogander <jouni.hogander@unikie.com>
> 
> __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.
> 
> Cc: Paul Burton <paulburton@kernel.org>
> Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>

Applied to mips-fixes.

> commit 3f0a2abff9aa
> https://git.kernel.org/mips/c/3f0a2abff9aa
> 
> Signed-off-by: Jouni Hogander <jouni.hogander@unikie.com>
> Signed-off-by: Paul Burton <paulburton@kernel.org>

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paulburton@kernel.org to report it. ]
diff mbox series

Patch

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