From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Mar 2019 00:48:21 +0000 (-0700)
Subject: Merge tag 'kbuild-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ffd602eb4693bbb49b301fa059b109bbdebf9524;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'kbuild-v5.1' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild updates from Masahiro Yamada:

 - do not generate unneeded top-level built-in.a

 - let git ignore O= directory entirely

 - optimize scripts/kallsyms slightly

 - exclude DWARF info from *.s regardless of config options

 - fix GCC toolchain search path for Clang to prepare ld.lld support

 - do not generate modules.order when CONFIG_MODULES is disabled

 - simplify single target rules and remove VPATH for external module
   build

 - allow to add optional flags to dpkg-buildpackage when building
   deb-pkg

 - move some compiler option tests from Makefile to Kconfig

 - various Makefile cleanups

* tag 'kbuild-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (40 commits)
  kbuild: remove scripts/basic/% build target
  kbuild: use -Werror=implicit-... instead of -Werror-implicit-...
  kbuild: clean up scripts/gcc-version.sh
  kbuild: remove cc-version macro
  kbuild: update comment block of scripts/clang-version.sh
  kbuild: remove commented-out INITRD_COMPRESS
  kbuild: move -gsplit-dwarf, -gdwarf-4 option tests to Kconfig
  kbuild: [bin]deb-pkg: add DPKG_FLAGS variable
  kbuild: move ".config not found!" message from Kconfig to Makefile
  kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing
  kbuild: simplify single target rules
  kbuild: remove empty rules for makefiles
  kbuild: make -r/-R effective in top Makefile for old Make versions
  kbuild: move tools_silent to a more relevant place
  kbuild: compute false-positive -Wmaybe-uninitialized cases in Kconfig
  kbuild: refactor cc-cross-prefix implementation
  kbuild: hardcode genksyms path and remove GENKSYMS variable
  scripts/gdb: refactor rules for symlink creation
  kbuild: create symlink to vmlinux-gdb.py in scripts_gdb target
  scripts/gdb: do not descend into scripts/gdb from scripts
  ...
---

ffd602eb4693bbb49b301fa059b109bbdebf9524
diff --cc Documentation/devicetree/bindings/Makefile
index 50daa0b3b032,e4eb5d1ea3b5..63b139f9ae28
--- a/Documentation/devicetree/bindings/Makefile
+++ b/Documentation/devicetree/bindings/Makefile
@@@ -15,13 -15,9 +15,13 @@@ DT_TMP_SCHEMA := processed-schema.yam
  extra-y += $(DT_TMP_SCHEMA)
  
  quiet_cmd_mk_schema = SCHEMA  $@
-       cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)
+       cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs)
  
 -DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')
 +DT_DOCS = $(shell \
 +	cd $(srctree)/$(src) && \
 +	find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \
 +	)
 +
  DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))
  
  extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
diff --cc Kbuild
index 4a4c47c38d1d,a07bbd62f052..8637fd14135f
--- a/Kbuild
+++ b/Kbuild
@@@ -59,27 -50,5 +50,17 @@@ quiet_cmd_syscalls = CALL    $
  missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE
  	$(call cmd,syscalls)
  
 +#####
- # 5) Check atomic headers are up-to-date
- #
++# Check atomic headers are up-to-date
 +
 +always += old-atomics
 +targets += old-atomics
 +
 +quiet_cmd_atomics = CALL    $<
 +      cmd_atomics = $(CONFIG_SHELL) $<
 +
 +old-atomics: scripts/atomic/check-atomics.sh FORCE
 +	$(call cmd,atomics)
 +
- #####
- # 6) Generate constants for Python GDB integration
- #
- 
- extra-$(CONFIG_GDB_SCRIPTS) += build_constants_py
- 
- build_constants_py: $(timeconst-file) $(bounds-file)
- 	@$(MAKE) $(build)=scripts/gdb/linux $@
- 
  # Keep these three files during make clean
  no-clean-files := $(bounds-file) $(offsets-file) $(timeconst-file)