Commit c1c07416 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -7667,9 +7667,11 @@ L: linux-kbuild@vger.kernel.org ...@@ -7667,9 +7667,11 @@ L: linux-kbuild@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/kbuild/ F: Documentation/kbuild/
F: Makefile F: Makefile
F: scripts/Makefile.* F: scripts/Kbuild*
F: scripts/Makefile*
F: scripts/basic/ F: scripts/basic/
F: scripts/mk* F: scripts/mk*
F: scripts/mod/
F: scripts/package/ F: scripts/package/
KERNEL JANITORS KERNEL JANITORS
......
...@@ -14,7 +14,7 @@ ifdef CONFIG_GCC_PLUGINS ...@@ -14,7 +14,7 @@ ifdef CONFIG_GCC_PLUGINS
endif endif
ifdef CONFIG_GCC_PLUGIN_SANCOV 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. # It is needed because of the gcc-plugin.sh and gcc version checks.
gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV) += sancov_plugin.so gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV) += sancov_plugin.so
......
...@@ -196,7 +196,7 @@ $(obj)/%.tab.c: $(src)/%.y FORCE ...@@ -196,7 +196,7 @@ $(obj)/%.tab.c: $(src)/%.y FORCE
$(call if_changed,bison) $(call if_changed,bison)
quiet_cmd_bison_h = YACC $@ 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 $(obj)/%.tab.h: $(src)/%.y FORCE
$(call if_changed,bison_h) $(call if_changed,bison_h)
......
...@@ -14,14 +14,14 @@ genksyms-objs := genksyms.o parse.tab.o lex.lex.o ...@@ -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. # so that 'bison: not found' will be displayed if it is missing.
ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),) 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_no_warn = $(YACC) --version >/dev/null; \
$(cmd_bison) 2>/dev/null $(cmd_bison) 2>/dev/null
$(obj)/parse.tab.c: $(src)/parse.y FORCE $(obj)/parse.tab.c: $(src)/parse.y FORCE
$(call if_changed,bison_no_warn) $(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_no_warn = $(YACC) --version >/dev/null; \
$(cmd_bison_h) 2>/dev/null $(cmd_bison_h) 2>/dev/null
......
...@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md) ...@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
goto out; goto out;
} }
/* There will be a line like so: /* Sum all files in the same dir or subdirs. */
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.
*/
while ((line = get_next_line(&pos, file, flen)) != NULL) { while ((line = get_next_line(&pos, file, flen)) != NULL) {
char* p = line; char* p = line;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment