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

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

Pull more Kbuild updates from Masahiro Yamada:

 - Convert sh and sparc to use generic shell scripts to generate the
   syscall headers

 - refactor .gitignore files

 - Update kernel/config_data.gz only when the content of the .config
   is really changed, which avoids the unneeded re-link of vmlinux

 - move "remove stale files" workarounds to scripts/remove-stale-files

 - suppress unused-but-set-variable warnings by default for Clang
   as well

 - fix locale setting LANG=C to LC_ALL=C

 - improve 'make distclean'

 - always keep intermediate objects from scripts/link-vmlinux.sh

 - move IF_ENABLED out of <linux/kconfig.h> to make it self-contained

 - misc cleanups

* tag 'kbuild-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (25 commits)
  linux/kconfig.h: replace IF_ENABLED() with PTR_IF() in <linux/kernel.h>
  kbuild: Don't remove link-vmlinux temporary files on exit/signal
  kbuild: remove the unneeded comments for external module builds
  kbuild: make distclean remove tag files in sub-directories
  kbuild: make distclean work against $(objtree) instead of $(srctree)
  kbuild: refactor modname-multi by using suffix-search
  kbuild: refactor fdtoverlay rule
  kbuild: parameterize the .o part of suffix-search
  arch: use cross_compiling to check whether it is a cross build or not
  kbuild: remove ARCH=sh64 support from top Makefile
  .gitignore: prefix local generated files with a slash
  kbuild: replace LANG=C with LC_ALL=C
  Makefile: Move -Wno-unused-but-set-variable out of GCC only block
  kbuild: add a script to remove stale generated files
  kbuild: update config_data.gz only when the content of .config is changed
  .gitignore: ignore only top-level modules.builtin
  .gitignore: move tags and TAGS close to other tag files
  kernel/.gitgnore: remove stale timeconst.h and hz.bc
  usr/include: refactor .gitignore
  genksyms: fix stale comment
  ...
parents ab159ac5 0ab1438b

.gitignore

+5 −3
Original line number Diff line number Diff line
@@ -48,14 +48,11 @@ 
*.xz

*.zst

Module.symvers

modules.builtin

modules.order



#

# Top-level generic files

#

/tags

/TAGS

/linux

/modules-only.symvers

/vmlinux
@@ -66,6 +63,7 @@ modules.order 
/vmlinuz

/System.map

/Module.markers

/modules.builtin

/modules.builtin.modinfo

/modules.nsdeps
@@ -114,6 +112,10 @@ patches-* 
patches

series



# ctags files

tags

TAGS



# cscope files

cscope.*

ncscope.*

Documentation/devicetree/bindings/.gitignore

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

*.example.dts

processed-schema*.yaml

processed-schema*.json
 
/processed-schema*.yaml

/processed-schema*.json

Makefile

+13 −29
Original line number Diff line number Diff line
@@ -399,11 +399,6 @@ ifeq ($(ARCH),sparc64) 
       SRCARCH := sparc

endif



# Additional ARCH settings for sh

ifeq ($(ARCH),sh64)

       SRCARCH := sh

endif



export cross_compiling :=

ifneq ($(SRCARCH),$(SUBARCH))

cross_compiling := 1
@@ -792,16 +787,16 @@ KBUILD_CFLAGS += -Wno-gnu 
KBUILD_CFLAGS += -mno-global-merge

else



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += -Wno-unused-but-set-variable



# Warn about unmarked fall-throughs in switch statement.

# Disabled for clang while comment to attribute conversion happens and

# https://github.com/ClangBuiltLinux/linux/issues/636 is discussed.

KBUILD_CFLAGS += $(call cc-option,-Wimplicit-fallthrough,)

endif



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)



KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls
@@ -1225,7 +1220,7 @@ PHONY += prepare archprepare 


archprepare: outputmakefile archheaders archscripts scripts include/config/kernel.release \

	asm-generic $(version_h) $(autoksyms_h) include/generated/utsrelease.h \

	include/generated/autoconf.h

	include/generated/autoconf.h remove-stale-files



prepare0: archprepare

	$(Q)$(MAKE) $(build)=scripts/mod
@@ -1234,6 +1229,10 @@ prepare0: archprepare 
# All the preparing..

prepare: prepare0 prepare-objtool prepare-resolve_btfids



PHONY += remove-stale-files

remove-stale-files:

	$(Q)$(srctree)/scripts/remove-stale-files



# Support for using generic headers in asm-generic

asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
@@ -1512,9 +1511,6 @@ MRPROPER_FILES += include/config include/generated \ 
		  vmlinux-gdb.py \

		  *.spec



# Directories & files removed with 'make distclean'

DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS



# clean - Delete most, but leave enough to build external modules

#

clean: rm-files := $(CLEAN_FILES)
@@ -1541,16 +1537,14 @@ mrproper: clean $(mrproper-dirs) 


# distclean

#

distclean: rm-files := $(wildcard $(DISTCLEAN_FILES))



PHONY += distclean



distclean: mrproper

	$(call cmd,rmfiles)

	@find $(srctree) $(RCS_FIND_IGNORE) \

	@find . $(RCS_FIND_IGNORE) \

		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \

		-o -name '*.bak' -o -name '#*#' -o -name '*%' \

		-o -name 'core' \) \

		-o -name 'core' -o -name tags -o -name TAGS -o -name 'cscope*' \

		-o -name GPATH -o -name GRTAGS -o -name GSYMS -o -name GTAGS \) \

		-type f -print | xargs rm -f
@@ -1717,17 +1711,7 @@ else # KBUILD_EXTMOD 
# When building external modules the kernel used as basis is considered

# read-only, and no consistency checks are made and the make

# system is not used on the basis kernel. If updates are required

# in the basis kernel ordinary make commands (without M=...) must

# be used.

#

# The following are the only valid targets when building external

# modules.

# make M=dir clean     Delete all automatically generated files

# make M=dir modules   Make all modules in specified dir

# make M=dir	       Same as 'make M=dir modules'

# make M=dir modules_install

#                      Install the modules built in the module directory

#                      Assumes install directory is already created

# in the basis kernel ordinary make commands (without M=...) must be used.



# We are always building only modules.

KBUILD_BUILTIN :=

arch/.gitignore

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

i386

x86_64
 
/i386/

/x86_64/

arch/arm/boot/compressed/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -96,13 +96,6 @@ endif 
$(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_check_mem_start.o, \

	$(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector))



# These were previously generated C files. When you are building the kernel

# with O=, make sure to remove the stale files in the output tree. Otherwise,

# the build system wrongly compiles the stale ones.

ifdef building_out_of_srctree

$(shell rm -f $(addprefix $(obj)/, fdt_rw.c fdt_ro.c fdt_wip.c fdt.c))

endif



targets       := vmlinux vmlinux.lds piggy_data piggy.o \

		 lib1funcs.o ashldi3.o bswapsdi2.o \

		 head.o $(OBJS)