From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Jan 2022 09:15:19 +0000 (+0200)
Subject: Merge tag 'kbuild-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: baikal/mips/sdk6.1~6602
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=91aec5ffd10b7d3e24288ae1f436126b20aa7a9d;p=kernel.git

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
  ...
---

91aec5ffd10b7d3e24288ae1f436126b20aa7a9d
diff --cc scripts/Makefile
index b082d2f933574,e198b22dc4764..ecd3acacd0ec5
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@@ -12,17 -9,12 +9,13 @@@ hostprogs-always-$(BUILD_C_RECORDMCOUNT
  hostprogs-always-$(CONFIG_BUILDTIME_TABLE_SORT)		+= sorttable
  hostprogs-always-$(CONFIG_ASN1)				+= asn1_compiler
  hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT)		+= sign-file
- hostprogs-always-$(CONFIG_SYSTEM_TRUSTED_KEYRING)	+= extract-cert
  hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE)	+= insert-sys-cert
- hostprogs-always-$(CONFIG_SYSTEM_REVOCATION_LIST)	+= extract-cert
  
  HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
 +HOSTLDLIBS_sorttable = -lpthread
  HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
- HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS)
- HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)
- HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
- HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)
+ HOSTCFLAGS_sign-file.o = $(shell pkg-config --cflags libcrypto 2> /dev/null)
+ HOSTLDLIBS_sign-file = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto)
  
  ifdef CONFIG_UNWINDER_ORC
  ifeq ($(ARCH),x86_64)
diff --cc scripts/link-vmlinux.sh
index 82bc736532f15,a4b61a2f65db5..666f7bbc13ebb
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@@ -127,21 -131,18 +131,21 @@@ objtool_link(
  			objtoolcmd="check"
  		fi
  		objtoolopt="${objtoolopt} --vmlinux"
- 		if [ -z "${CONFIG_FRAME_POINTER}" ]; then
+ 		if ! is_enabled CONFIG_FRAME_POINTER; then
  			objtoolopt="${objtoolopt} --no-fp"
  		fi
- 		if [ -n "${CONFIG_GCOV_KERNEL}" ] || [ -n "${CONFIG_LTO_CLANG}" ]; then
+ 		if is_enabled CONFIG_GCOV_KERNEL || is_enabled CONFIG_LTO_CLANG; then
  			objtoolopt="${objtoolopt} --no-unreachable"
  		fi
- 		if [ -n "${CONFIG_RETPOLINE}" ]; then
+ 		if is_enabled CONFIG_RETPOLINE; then
  			objtoolopt="${objtoolopt} --retpoline"
  		fi
- 		if [ -n "${CONFIG_X86_SMAP}" ]; then
+ 		if is_enabled CONFIG_X86_SMAP; then
  			objtoolopt="${objtoolopt} --uaccess"
  		fi
- 		if [ -n "${CONFIG_SLS}" ]; then
++		if is_enabled CONFIG_SLS; then
 +			objtoolopt="${objtoolopt} --sls"
 +		fi
  		info OBJTOOL ${1}
  		tools/objtool/objtool ${objtoolcmd} ${objtoolopt} ${1}
  	fi
@@@ -403,10 -401,7 +404,10 @@@ if is_enabled CONFIG_DEBUG_INFO_BTF && 
  	${RESOLVE_BTFIDS} vmlinux
  fi
  
 +info SYSMAP System.map
 +mksysmap vmlinux System.map
 +
- if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
+ if is_enabled CONFIG_BUILDTIME_TABLE_SORT; then
  	info SORTTAB vmlinux
  	if ! sorttable vmlinux; then
  		echo >&2 Failed to sort kernel tables
@@@ -414,8 -409,11 +415,8 @@@
  	fi
  fi
  
 -info SYSMAP System.map
 -mksysmap vmlinux System.map
 -
  # step a (see comment above)
- if [ -n "${CONFIG_KALLSYMS}" ]; then
+ if is_enabled CONFIG_KALLSYMS; then
  	mksysmap ${kallsyms_vmlinux} .tmp_System.map
  
  	if ! cmp -s System.map .tmp_System.map; then
diff --cc scripts/remove-stale-files
index 80430b8fb617f,dd230792056a5..7adab4618035b
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
@@@ -33,9 -33,6 +33,11 @@@ if [ -n "${building_out_of_srctree}" ]
  	do
  		rm -f arch/mips/boot/compressed/${f}
  	done
 +
 +	for f in firmware.c real2.S
 +	do
 +		rm -f arch/parisc/boot/compressed/${f}
 +	done
  fi
+ 
+ rm -f scripts/extract-cert