Commit 7f7f6f7a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

Makefile: remove redundant tool coverage variables 



Now Kbuild provides reasonable defaults for objtool, sanitizers, and
profilers.

Remove redundant variables.

Note:

This commit changes the coverage for some objects:

  - include arch/mips/vdso/vdso-image.o into UBSAN, GCOV, KCOV
  - include arch/sparc/vdso/vdso-image-*.o into UBSAN
  - include arch/sparc/vdso/vma.o into UBSAN
  - include arch/x86/entry/vdso/extable.o into KASAN, KCSAN, UBSAN, GCOV, KCOV
  - include arch/x86/entry/vdso/vdso-image-*.o into KASAN, KCSAN, UBSAN, GCOV, KCOV
  - include arch/x86/entry/vdso/vdso32-setup.o into KASAN, KCSAN, UBSAN, GCOV, KCOV
  - include arch/x86/entry/vdso/vma.o into GCOV, KCOV
  - include arch/x86/um/vdso/vma.o into KASAN, GCOV, KCOV

I believe these are positive effects because all of them are kernel
space objects.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
parent 9c2d1328

arch/arm/boot/bootp/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
# This file is included by the global makefile so that you can add your own

# architecture-specific flags and dependencies.

#

GCOV_PROFILE	:= n



ifdef PHYS_OFFSET

add_hex = $(shell printf 0x%x $$(( $(1) + $(2) )) )

arch/arm/boot/compressed/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -22,13 +22,6 @@ ifeq ($(CONFIG_ARM_VIRT_EXT),y) 
OBJS		+= hyp-stub.o

endif



GCOV_PROFILE		:= n

KASAN_SANITIZE		:= n



# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.

KCOV_INSTRUMENT		:= n

UBSAN_SANITIZE		:= n



#

# Architecture dependencies

#

arch/arm/vdso/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ else 
CFLAGS_vgettimeofday.o = -O2 -include $(c-gettimeofday-y)

endif



# Disable gcov profiling for VDSO code

GCOV_PROFILE := n

UBSAN_SANITIZE := n



# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.

KCOV_INSTRUMENT := n



KASAN_SANITIZE := n



# Force dependency

$(obj)/vdso.o : $(obj)/vdso.so

arch/arm64/kernel/pi/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) 
# disable LTO

KBUILD_CFLAGS	:= $(filter-out $(CC_FLAGS_LTO), $(KBUILD_CFLAGS))



GCOV_PROFILE	:= n

KASAN_SANITIZE	:= n

KCSAN_SANITIZE	:= n

UBSAN_SANITIZE	:= n

KCOV_INSTRUMENT	:= n



hostprogs	:= relacheck



quiet_cmd_piobjcopy = $(quiet_cmd_objcopy)

arch/arm64/kernel/vdso/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) \ 
				$(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) \

				$(CC_FLAGS_LTO) $(CC_FLAGS_CFI) \

				-Wmissing-prototypes -Wmissing-declarations

KASAN_SANITIZE			:= n

KCSAN_SANITIZE			:= n

UBSAN_SANITIZE			:= n

OBJECT_FILES_NON_STANDARD	:= y

KCOV_INSTRUMENT			:= n



CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny -fasynchronous-unwind-tables
@@ -52,9 +47,6 @@ ifneq ($(c-gettimeofday-y),) 
  CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y)

endif



# Disable gcov profiling for VDSO code

GCOV_PROFILE := n



targets += vdso.lds

CPPFLAGS_vdso.lds += -P -C -U$(ARCH)