diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-19 11:15:19 +0200 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-19 11:15:19 +0200 | 
| commit | fd6f57bfda7c36f2d465cee39d5d8c623db5d7aa (patch) | |
| tree | ef124e2aedebf78628b6003b048be387745af741 /init | |
| parent | 0ed905975612ea67224af26fd6bfbac965b6d029 (diff) | |
| parent | c4d7f40b250c1a4d74ed259e84807f58032507b6 (diff) | |
| download | linux-fd6f57bfda7c36f2d465cee39d5d8c623db5d7aa.tar.bz2 | |
Merge tag 'kbuild-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada:
 - Add new kconfig target 'make mod2noconfig', which will be useful to
   speed up the build and test iteration.
 - Raise the minimum supported version of LLVM to 11.0.0
 - Refactor certs/Makefile
 - Change the format of include/config/auto.conf to stop double-quoting
   string type CONFIG options.
 - Fix ARCH=sh builds in dash
 - Separate compression macros for general purposes (cmd_bzip2 etc.) and
   the ones for decompressors (cmd_bzip2_with_size etc.)
 - Misc Makefile cleanups
* tag 'kbuild-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (34 commits)
  kbuild: add cmd_file_size
  arch: decompressor: remove useless vmlinux.bin.all-y
  kbuild: rename cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}
  kbuild: drop $(size_append) from cmd_zstd
  sh: rename suffix-y to suffix_y
  doc: kbuild: fix default in `imply` table
  microblaze: use built-in function to get CPU_{MAJOR,MINOR,REV}
  certs: move scripts/extract-cert to certs/
  kbuild: do not quote string values in include/config/auto.conf
  kbuild: do not include include/config/auto.conf from shell scripts
  certs: simplify $(srctree)/ handling and remove config_filename macro
  kbuild: stop using config_filename in scripts/Makefile.modsign
  certs: remove misleading comments about GCC PR
  certs: refactor file cleaning
  certs: remove unneeded -I$(srctree) option for system_certificates.o
  certs: unify duplicated cmd_extract_certs and improve the log
  certs: use $< and $@ to simplify the key generation rule
  kbuild: remove headers_check stub
  kbuild: move headers_check.pl to usr/include/
  certs: use if_changed to re-generate the key when the key type is changed
  ...
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 | ||||
| -rw-r--r-- | init/Makefile | 2 | 
2 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index fc61bfa5ebb2..e9119bf54b1f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1414,7 +1414,6 @@ config LD_DEAD_CODE_DATA_ELIMINATION  config LD_ORPHAN_WARN  	def_bool y  	depends on ARCH_WANT_LD_ORPHAN_WARN -	depends on !LD_IS_LLD || LLD_VERSION >= 110000  	depends on $(ld-option,--orphan-handling=warn)  config SYSCTL diff --git a/init/Makefile b/init/Makefile index 04eeee12c076..06326e304384 100644 --- a/init/Makefile +++ b/init/Makefile @@ -31,7 +31,7 @@ quiet_cmd_compile.h = CHK     $@        cmd_compile.h = \  	$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@	\  	"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT_BUILD)"	\ -	"$(CONFIG_PREEMPT_RT)" $(CONFIG_CC_VERSION_TEXT) "$(LD)" +	"$(CONFIG_PREEMPT_RT)" "$(CONFIG_CC_VERSION_TEXT)" "$(LD)"  include/generated/compile.h: FORCE  	$(call cmd,compile.h)  |