Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1c07416 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v4.17' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - remove state comment in modpost

 - extend MAINTAINERS entry to cover modpost and more makefiles

 - fix missed building of SANCOV gcc-plugin

 - replace left-over 'bison' with $(YACC)

 - display short log when generating parer of genksyms

* tag 'kbuild-fixes-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  genksyms: fix typo in parse.tab.{c,h} generation rules
  kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)
  gcc-plugins: fix build condition of SANCOV plugin
  MAINTAINERS: Update Kbuild entry with a few paths
  modpost: delete stale comment
parents 4a7a7729 0da7e432

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -7667,9 +7667,11 @@ L: linux-kbuild@vger.kernel.org 
S:	Maintained

F:	Documentation/kbuild/

F:	Makefile

F:	scripts/Makefile.*

F:	scripts/Kbuild*

F:	scripts/Makefile*

F:	scripts/basic/

F:	scripts/mk*

F:	scripts/mod/

F:	scripts/package/



KERNEL JANITORS

scripts/Makefile.gcc-plugins

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ ifdef CONFIG_GCC_PLUGINS 
  endif



  ifdef CONFIG_GCC_PLUGIN_SANCOV

    ifeq ($(CFLAGS_KCOV),)

    ifeq ($(strip $(CFLAGS_KCOV)),)

      # It is needed because of the gcc-plugin.sh and gcc version checks.

      gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV)           += sancov_plugin.so

scripts/Makefile.lib

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ $(obj)/%.tab.c: $(src)/%.y FORCE 
	$(call if_changed,bison)



quiet_cmd_bison_h = YACC    $@

      cmd_bison_h = bison -o/dev/null --defines=$@ -t -l $<

      cmd_bison_h = $(YACC) -o/dev/null --defines=$@ -t -l $<



$(obj)/%.tab.h: $(src)/%.y FORCE

	$(call if_changed,bison_h)

scripts/genksyms/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ genksyms-objs := genksyms.o parse.tab.o lex.lex.o 
# so that 'bison: not found' will be displayed if it is missing.

ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),)



quiet_cmd_bison_no_warn = $(quet_cmd_bison)

quiet_cmd_bison_no_warn = $(quiet_cmd_bison)

      cmd_bison_no_warn = $(YACC) --version >/dev/null; \

			  $(cmd_bison) 2>/dev/null



$(obj)/parse.tab.c: $(src)/parse.y FORCE

	$(call if_changed,bison_no_warn)



quiet_cmd_bison_h_no_warn = $(quet_cmd_bison_h)

quiet_cmd_bison_h_no_warn = $(quiet_cmd_bison_h)

      cmd_bison_h_no_warn = $(YACC) --version >/dev/null; \

			    $(cmd_bison_h) 2>/dev/null

scripts/mod/sumversion.c

+1 −8
Original line number Diff line number Diff line
@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md) 
		goto out;

	}



	/* There will be a line like so:

		deps_drivers/net/dummy.o := \

		  drivers/net/dummy.c \

		    $(wildcard include/config/net/fastroute.h) \

		  include/linux/module.h \



	   Sum all files in the same dir or subdirs.

	*/

	/* Sum all files in the same dir or subdirs. */

	while ((line = get_next_line(&pos, file, flen)) != NULL) {

		char* p = line;