Commit 152eaa86 authored Dec 18, 2019 by Christian Borntraeger Committed by Greg Kroah-Hartman Jan 12, 2020

s390/purgatory: do not build purgatory with kcov, kasan and friends



[ Upstream commit c23587c92f6e3260fe3b82bb75b38aa2553b9468 ]

the purgatory must not rely on functions from the "old" kernel,
so we must disable kasan and friends. We also need to have a
separate copy of string.c as the default does not build memcmp
with KASAN.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 5ee6f0da

arch/s390/purgatory/Makefile

+4 −2

Original line number	Diff line number	Diff line
		@@ -13,8 +13,10 @@ $(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
		$(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE
		$(call if_changed_rule,as_o_S)

		$(obj)/string.o: $(srctree)/arch/s390/lib/string.c FORCE
		$(call if_changed_rule,cc_o_c)
		KCOV_INSTRUMENT := n
		GCOV_PROFILE := n
		UBSAN_SANITIZE := n
		KASAN_SANITIZE := n

		LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib
		LDFLAGS_purgatory.ro += -z nodefaultlib

arch/s390/purgatory/string.c

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		#define __HAVE_ARCH_MEMCMP /* arch function */
		#include "../lib/string.c"