Commit 20210a98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.11' of... 

Merge tag 'kbuild-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Search for <ncurses.h> in the default header path of HOSTCC

 - Tweak the option order to be kind to old BSD awk

 - Remove 'kvmconfig' and 'xenconfig' shorthands

 - Fix documentation

* tag 'kbuild-fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  Documentation: kbuild: Fix section reference
  kconfig: remove 'kvmconfig' and 'xenconfig' shorthands
  lib/raid6: Let $(UNROLL) rules work with macOS userland
  kconfig: Support building mconf with vendor sysroot ncurses
  kconfig: config script: add a little user help
  MAINTAINERS: adjust GCC PLUGINS after gcc-plugin.sh removal
parents 688daed2 5625dcfb

Documentation/kbuild/makefiles.rst

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ more details, with real examples. 
	explicitly added to $(targets).



	Assignments to $(targets) are without $(obj)/ prefix. if_changed may be

	used in conjunction with custom rules as defined in "3.9 Custom Rules".

	used in conjunction with custom rules as defined in "3.11 Custom Rules".



	Note: It is a typical mistake to forget the FORCE prerequisite.

	Another common pitfall is that whitespace is sometimes significant; for

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7363,7 +7363,6 @@ L: linux-hardening@vger.kernel.org 
S:	Maintained

F:	Documentation/kbuild/gcc-plugins.rst

F:	scripts/Makefile.gcc-plugins

F:	scripts/gcc-plugin.sh

F:	scripts/gcc-plugins/









GCOV BASED KERNEL PROFILING
































lib/raid6/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -48,7 +48,7 @@ endif







endif



















quiet_cmd_unroll = UNROLL  $@









      cmd_unroll = $(AWK) -f$(srctree)/$(src)/unroll.awk -vN=$* < $< > $@









      cmd_unroll = $(AWK) -v N=$* -f $(srctree)/$(src)/unroll.awk < $< > $@



















targets += int1.c int2.c int4.c int8.c int16.c int32.c









$(obj)/int%.c: $(src)/int.uc $(src)/unroll.awk FORCE
































scripts/config



+1
−0






























Original line number
Diff line number
Diff line







@@ -223,6 +223,7 @@ while [ "$1" != "" ] ; do







		;;



















	*)









		echo "bad command: $CMD" >&2









		usage









		;;









	esac
































scripts/kconfig/Makefile



+0
−10






























Original line number
Diff line number
Diff line







@@ -94,16 +94,6 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c







	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)









	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig



















PHONY += kvmconfig









kvmconfig: kvm_guest.config









	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"









	@echo >&2 "         Please use 'make $<' instead."



















PHONY += xenconfig









xenconfig: xen.config









	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"









	@echo >&2 "         Please use 'make $<' instead."



















PHONY += tinyconfig









tinyconfig:









	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config