Commit 0eb3412a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kbuild fixes from Masahiro Yamada:

 - suppress sparse warnings about unknown attributes

 - fix typos and stale comments

 - fix build error of arch/sh

 - fix wrong use of ld-option vs cc-ldoption

 - remove redundant GCC_PLUGINS_CFLAGS assignment

 - fix another memory leak of Kconfig

 - fix line number in error messages of Kconfig

 - do not write confusing CONFIG_DEFCONFIG_LIST out to .config

 - add xstrdup() to Kconfig to handle memory shortage errors

 - show also a Debian package name if ncurses is missing

* tag 'kbuild-fixes-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  MAINTAINERS: take over Kconfig maintainership
  kconfig: fix line number in recursive inclusion error message
  Coccinelle: memdup: Fix typo in warning messages
  kconfig: Update ncurses package names for menuconfig
  kbuild/kallsyms: trivial typo fix
  kbuild: test --build-id linker flag by ld-option instead of cc-ldoption
  kbuild: drop superfluous GCC_PLUGINS_CFLAGS assignment
  kconfig: Don't leak choice names during parsing
  sh: fix build error for empty CONFIG_BUILTIN_DTB_SOURCE
  kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list
  kconfig: add xstrdup() helper
  kbuild: disable sparse warnings about unknown attributes
  Makefile: Fix lying comment re. silentoldconfig
parents 7cf901b3 50186e12

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -7602,8 +7602,10 @@ F: mm/kasan/ 
F:	scripts/Makefile.kasan



KCONFIG

M:	Masahiro Yamada <yamada.masahiro@socionext.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig

L:	linux-kbuild@vger.kernel.org

S:	Orphan

S:	Maintained

F:	Documentation/kbuild/kconfig-language.txt

F:	scripts/kconfig/

Makefile

+5 −7
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ PYTHON = python 
CHECK		= sparse



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void $(CF)

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)

NOSTDINC_FLAGS  =

CFLAGS_MODULE   =

AFLAGS_MODULE   =
@@ -584,10 +584,9 @@ ifeq ($(KBUILD_EXTMOD),) 
# To avoid any implicit rule to kick in, define an empty command

$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;



# If .config is newer than include/config/auto.conf, someone tinkered

# with it and forgot to run make oldconfig.

# if auto.conf.cmd is missing then we are probably in a cleaned tree so

# we execute the config step to be sure to catch updated Kconfig files

# The actual configuration files used during the build are stored in

# include/generated/ and include/config/. Update them if .config is newer than

# include/config/auto.conf (which mirrors .config).

include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd

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

else
@@ -862,8 +861,7 @@ KBUILD_AFLAGS += $(ARCH_AFLAGS) $(KAFLAGS) 
KBUILD_CFLAGS   += $(ARCH_CFLAGS)   $(KCFLAGS)



# Use --build-id when available.

LDFLAGS_BUILD_ID := $(patsubst -Wl$(comma)%,%,\

			      $(call cc-ldoption, -Wl$(comma)--build-id,))

LDFLAGS_BUILD_ID := $(call ld-option, --build-id)

KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)

LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)

arch/sh/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o
 
ifneq ($(CONFIG_BUILTIN_DTB_SOURCE),"")

obj-y += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o

endif

scripts/coccinelle/api/memdup.cocci

+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ statement S; 
p << r.p;

@@



coccilib.org.print_todo(p[0], "WARNING opportunity for kmemdep")

coccilib.org.print_todo(p[0], "WARNING opportunity for kmemdup")



@script:python depends on report@

p << r.p;

@@



coccilib.report.print_report(p[0], "WARNING opportunity for kmemdep")
 
coccilib.report.print_report(p[0], "WARNING opportunity for kmemdup")

scripts/kallsyms.c

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static void optimize_result(void) 
		 * original char code */

		if (!best_table_len[i]) {



			/* find the token with the breates profit value */

			/* find the token with the best profit value */

			best = find_best_token();

			if (token_profit[best] == 0)

				break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE