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

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

Pull more Kbuild updates from Masahiro Yamada:

 - remove unneeded use of cc-option, cc-disable-warning, cc-ldoption

 - exclude tracked files from .gitignore

 - re-enable -Wint-in-bool-context warning

 - refactor samples/Makefile

 - stop building immediately if syncconfig fails

 - do not sprinkle error messages when $(CC) does not exist

 - move arch/alpha/defconfig to the configs subdirectory

 - remove crappy header search path manipulation

 - add comment lines to .config to clarify the end of menu blocks

 - check uniqueness of module names (adding new warnings intentionally)

* tag 'kbuild-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (24 commits)
  kconfig: use 'else ifneq' for Makefile to improve readability
  kbuild: check uniqueness of module names
  kconfig: Terminate menu blocks with a comment in the generated config
  kbuild: add LICENSES to KBUILD_ALLDIRS
  kbuild: remove 'addtree' and 'flags' magic for header search paths
  treewide: prefix header search paths with $(srctree)/
  media: prefix header search paths with $(srctree)/
  media: remove unneeded header search paths
  alpha: move arch/alpha/defconfig to arch/alpha/configs/defconfig
  kbuild: terminate Kconfig when $(CC) or $(LD) is missing
  kbuild: turn auto.conf.cmd into a mandatory include file
  .gitignore: exclude .get_maintainer.ignore and .gitattributes
  kbuild: add all Clang-specific flags unconditionally
  kbuild: Don't try to add '-fcatch-undefined-behavior' flag
  kbuild: add some extra warning flags unconditionally
  kbuild: add -Wvla flag unconditionally
  arch: remove dangling asm-generic wrappers
  samples: guard sub-directories with CONFIG options
  kbuild: re-enable int-in-bool-context warning
  MAINTAINERS: kbuild: Add pattern for scripts/*vmlinux*
  ...
parents f23d8719 fc2694ec

.gitignore

+5 −3
Original line number Diff line number Diff line
@@ -81,12 +81,14 @@ modules.builtin 
/tar-install/



#

# git files that we don't want to ignore even if they are dot-files

# We don't want to ignore the following even if they are dot-files

#

!.clang-format

!.cocciconfig

!.get_maintainer.ignore

!.gitattributes

!.gitignore

!.mailmap

!.cocciconfig

!.clang-format



#

# Generated include files

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8542,6 +8542,7 @@ F: scripts/Kbuild* 
F:	scripts/Makefile*

F:	scripts/basic/

F:	scripts/mk*

F:	scripts/*vmlinux*

F:	scripts/mod/

F:	scripts/package/

Makefile

+10 −11
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ endif 
# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.

# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),

# and from include/config/auto.conf.cmd to detect the compiler upgrade.

CC_VERSION_TEXT = $(shell $(CC) --version | head -n 1)

CC_VERSION_TEXT = $(shell $(CC) --version 2>/dev/null | head -n 1)



ifeq ($(config-targets),1)

# ===========================================================================
@@ -651,7 +651,7 @@ ifeq ($(may-sync-config),1) 
# Read in dependencies to all Kconfig* files, make sure to run syncconfig if

# changes are detected. This should be included after arch/$(SRCARCH)/Makefile

# because some architectures define CROSS_COMPILE there.

-include include/config/auto.conf.cmd

include include/config/auto.conf.cmd



$(KCONFIG_CONFIG):

	@echo >&2 '***'
@@ -692,7 +692,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning,frame-address,)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -732,16 +731,15 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG) := -fstack-protector-strong 
KBUILD_CFLAGS += $(stackp-flags-y)



ifdef CONFIG_CC_IS_CLANG

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CPPFLAGS += -Qunused-arguments

KBUILD_CFLAGS += -Wno-format-invalid-specifier

KBUILD_CFLAGS += -Wno-gnu

# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

KBUILD_CFLAGS += -Wno-tautological-compare

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

# source of a reference will be _MergedGlobals and not on of the whitelisted names.

# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

KBUILD_CFLAGS += -mno-global-merge

else



# These warnings generated too much noise in a regular build.
@@ -842,7 +840,7 @@ NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) 
KBUILD_CFLAGS += -Wdeclaration-after-statement



# Variable Length Arrays (VLAs) should not be used anywhere in the kernel

KBUILD_CFLAGS += $(call cc-option,-Wvla)

KBUILD_CFLAGS += -Wvla



# disable pointer signed / unsigned warnings in gcc 4.0

KBUILD_CFLAGS += -Wno-pointer-sign
@@ -1018,7 +1016,7 @@ export KBUILD_VMLINUX_LIBS := $(libs-y1) 
export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds

export LDFLAGS_vmlinux

# used by scripts/package/Makefile

export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch include scripts tools)

export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)



vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)
@@ -1290,6 +1288,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin 
	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order

	@$(kecho) '  Building modules, stage 2.';

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh



modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)

	$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin

arch/alpha/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
# Copyright (C) 1994 by Linus Torvalds

#



KBUILD_DEFCONFIG := defconfig



NM := $(NM) -B



LDFLAGS_vmlinux	:= -static -N #-relax

arch/alpha/defconfig→arch/alpha/configs/defconfig

+0 −0

File moved.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE