From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Sep 2021 22:33:47 +0000 (-0700)
Subject: Merge tag 'kbuild-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: microblaze-v5.16~99
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=b250e6d141ce4f0d0ada60e4b5db577050e5feb0

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

Pull Kbuild updates from Masahiro Yamada:

 - Add -s option (strict mode) to merge_config.sh to make it fail when
   any symbol is redefined.

 - Show a warning if a different compiler is used for building external
   modules.

 - Infer --target from ARCH for CC=clang to let you cross-compile the
   kernel without CROSS_COMPILE.

 - Make the integrated assembler default (LLVM_IAS=1) for CC=clang.

 - Add <linux/stdarg.h> to the kernel source instead of borrowing
   <stdarg.h> from the compiler.

 - Add Nick Desaulniers as a Kbuild reviewer.

 - Drop stale cc-option tests.

 - Fix the combination of CONFIG_TRIM_UNUSED_KSYMS and CONFIG_LTO_CLANG
   to handle symbols in inline assembly.

 - Show a warning if 'FORCE' is missing for if_changed rules.

 - Various cleanups

* tag 'kbuild-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (39 commits)
  kbuild: redo fake deps at include/ksym/*.h
  kbuild: clean up objtool_args slightly
  modpost: get the *.mod file path more simply
  checkkconfigsymbols.py: Fix the '--ignore' option
  kbuild: merge vmlinux_link() between ARCH=um and other architectures
  kbuild: do not remove 'linux' link in scripts/link-vmlinux.sh
  kbuild: merge vmlinux_link() between the ordinary link and Clang LTO
  kbuild: remove stale *.symversions
  kbuild: remove unused quiet_cmd_update_lto_symversions
  gen_compile_commands: extract compiler command from a series of commands
  x86: remove cc-option-yn test for -mtune=
  arc: replace cc-option-yn uses with cc-option
  s390: replace cc-option-yn uses with cc-option
  ia64: move core-y in arch/ia64/Makefile to arch/ia64/Kbuild
  sparc: move the install rule to arch/sparc/Makefile
  security: remove unneeded subdir-$(CONFIG_...)
  kbuild: sh: remove unused install script
  kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y
  kbuild: Switch to 'f' variants of integrated assembler flag
  kbuild: Shuffle blank line to improve comment meaning
  ...
---

b250e6d141ce4f0d0ada60e4b5db577050e5feb0
diff --cc MAINTAINERS
index fa87db67a249,f5a650eea80b..5ffe43730e43
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4529,9 -4498,10 +4529,10 @@@ L:	clang-built-linux@googlegroups.co
  S:	Supported
  W:	https://clangbuiltlinux.github.io/
  B:	https://github.com/ClangBuiltLinux/linux/issues
 -C:	irc://chat.freenode.net/clangbuiltlinux
 +C:	irc://irc.libera.chat/clangbuiltlinux
  F:	Documentation/kbuild/llvm.rst
  F:	include/linux/compiler-clang.h
+ F:	scripts/Makefile.clang
  F:	scripts/clang-tools/
  K:	\b(?i:clang|llvm)\b
  
diff --cc arch/x86/Makefile
index d82d01490dd3,0fa7dc73b5d8..7488cfbbd2f6
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@@ -70,10 -72,10 +70,10 @@@ ifeq ($(CONFIG_X86_32),y
          # Align the stack to the register width instead of using the default
          # alignment of 16 bytes. This reduces stack usage and the number of
          # alignment instructions.
 -        KBUILD_CFLAGS += $(call cc-option,$(cc_stack_align4))
 +        KBUILD_CFLAGS += $(cc_stack_align4)
  
          # CPU-specific tuning. Anything which can be shared with UML should go here.
-         include arch/x86/Makefile_32.cpu
+         include $(srctree)/arch/x86/Makefile_32.cpu
          KBUILD_CFLAGS += $(cflags-y)
  
          # temporary until string.h is fixed