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

Commit 9f0bffa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kbuild fixes from Masahiro Yamada:

 - hand-off primary maintainership of Kbuild

 - fix build warnings

 - fix build error when GCOV is enabled with old compiler

 - fix HAVE_ASM_GOTO check when GCC plugin is enabled

* tag 'kbuild-fixes-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  gconfig: remove misleading parentheses around a condition
  jump label: fix passing kbuild_cflags when checking for asm goto support
  Kbuild: use cc-disable-warning consistently for maybe-uninitialized
  kbuild: external module build warnings when KBUILD_OUTPUT set and W=1
  MAINTAINERS: add Masahiro Yamada as a Kbuild maintainer
parents 308ac756 9be3213b

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7089,9 +7089,9 @@ S: Maintained 
F:	fs/autofs4/



KERNEL BUILD + files below scripts/ (unless maintained elsewhere)

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

M:	Michal Marek <mmarek@suse.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git for-next

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes

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

L:	linux-kbuild@vger.kernel.org

S:	Maintained

F:	Documentation/kbuild/

Makefile

+7 −7
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ LDFLAGS_MODULE = 
CFLAGS_KERNEL	=

AFLAGS_KERNEL	=

LDFLAGS_vmlinux =

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized

CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)

CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
@@ -653,6 +653,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \ 
# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif



include scripts/Makefile.gcc-plugins



ifdef CONFIG_READABLE_ASM
@@ -798,12 +804,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) 
# use the deterministic mode of AR if available

KBUILD_ARFLAGS := $(call ar-option,D)



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif



include scripts/Makefile.kasan

include scripts/Makefile.extrawarn

include scripts/Makefile.ubsan

scripts/Makefile.lib

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ else 
# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files

#   and locates generated .h files

# FIXME: Replace both with specific CFLAGS* statements in the makefiles

__c_flags	= $(if $(obj),-I$(srctree)/$(src) -I$(obj)) \

__c_flags	= $(if $(obj),$(call addtree,-I$(src)) -I$(obj)) \

		  $(call flags,_c_flags)

__a_flags	= $(call flags,_a_flags)

__cpp_flags     = $(call flags,_cpp_flags)

scripts/kconfig/gconf.c

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget, 
			current = menu;

			display_tree_part();

			gtk_widget_set_sensitive(back_btn, TRUE);

		} else if ((col == COL_OPTION)) {

		} else if (col == COL_OPTION) {

			toggle_sym_value(menu);

			gtk_tree_view_expand_row(view, path, TRUE);

		}