From: Linus Torvalds Date: Thu, 25 Feb 2021 18:17:31 +0000 (-0800) Subject: Merge tag 'kbuild-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... X-Git-Tag: v5.12-rc1-dontuse~35 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6fbd6cf85a3be127454a1ad58525a3adcf8612ab;p=linux-block.git Merge tag 'kbuild-v5.12' of git://git./linux/kernel/git/masahiroy/linux-kbuild Pull Kbuild updates from Masahiro Yamada: - Fix false-positive build warnings for ARCH=ia64 builds - Optimize dictionary size for module compression with xz - Check the compiler and linker versions in Kconfig - Fix misuse of extra-y - Support DWARF v5 debug info - Clamp SUBLEVEL to 255 because stable releases 4.4.x and 4.9.x exceeded the limit - Add generic syscall{tbl,hdr}.sh for cleanups across arches - Minor cleanups of genksyms - Minor cleanups of Kconfig * tag 'kbuild-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (38 commits) initramfs: Remove redundant dependency of RD_ZSTD on BLK_DEV_INITRD kbuild: remove deprecated 'always' and 'hostprogs-y/m' kbuild: parse C= and M= before changing the working directory kbuild: reuse this-makefile to define abs_srctree kconfig: unify rule of config, menuconfig, nconfig, gconfig, xconfig kconfig: omit --oldaskconfig option for 'make config' kconfig: fix 'invalid option' for help option kconfig: remove dead code in conf_askvalue() kconfig: clean up nested if-conditionals in check_conf() kconfig: Remove duplicate call to sym_get_string_value() Makefile: Remove # characters from compiler string Makefile: reuse CC_VERSION_TEXT kbuild: check the minimum linker version in Kconfig kbuild: remove ld-version macro scripts: add generic syscallhdr.sh scripts: add generic syscalltbl.sh arch: syscalls: remove $(srctree)/ prefix from syscall tables arch: syscalls: add missing FORCE and fix 'targets' to make if_changed work gen_compile_commands: prune some directories kbuild: simplify access to the kernel's version ... --- 6fbd6cf85a3be127454a1ad58525a3adcf8612ab diff --cc arch/mips/kernel/syscalls/Makefile index a1ce8b7dbcfa,ed22b711ccb7..51f8b805f2ed --- a/arch/mips/kernel/syscalls/Makefile +++ b/arch/mips/kernel/syscalls/Makefile @@@ -44,17 -44,17 +44,17 @@@ $(uapi)/unistd_o32.h: $(syscallo32) $(s sysnr_pfx_unistd_nr_n32 := N32 sysnr_offset_unistd_nr_n32 := 6000 - $(kapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) -$(uapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) FORCE ++$(kapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) FORCE $(call if_changed,sysnr) sysnr_pfx_unistd_nr_n64 := 64 sysnr_offset_unistd_nr_n64 := 5000 - $(kapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) -$(uapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) FORCE ++$(kapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) FORCE $(call if_changed,sysnr) sysnr_pfx_unistd_nr_o32 := O32 sysnr_offset_unistd_nr_o32 := 4000 - $(kapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) -$(uapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) FORCE ++$(kapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) FORCE $(call if_changed,sysnr) systbl_abi_syscall_table_32_o32 := 32_o32 @@@ -83,14 -86,12 +83,15 @@@ uapisyshdr-y += unistd_n32.h kapisyshdr-y += syscall_table_32_o32.h \ syscall_table_64_n32.h \ syscall_table_64_n64.h \ - syscall_table_64_o32.h + syscall_table_64_o32.h \ + unistd_nr_n32.h \ + unistd_nr_n64.h \ + unistd_nr_o32.h - targets += $(uapisyshdr-y) $(kapisyshdr-y) + uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y)) + kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y)) + targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y)) PHONY += all - all: $(addprefix $(uapi)/,$(uapisyshdr-y)) - all: $(addprefix $(kapi)/,$(kapisyshdr-y)) + all: $(uapisyshdr-y) $(kapisyshdr-y) @: diff --cc drivers/gpu/drm/i915/Makefile index 32bd1fdffffe,938221894d0c..2ae471518d9a --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@@ -296,9 -284,17 +296,9 @@@ obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt # exclude some broken headers from the test coverage no-header-test := \ - display/intel_vbt_defs.h \ - gvt/execlist.h \ - gvt/fb_decoder.h \ - gvt/gtt.h \ - gvt/gvt.h \ - gvt/interrupt.h \ - gvt/mmio_context.h \ - gvt/mpt.h \ - gvt/scheduler.h + display/intel_vbt_defs.h - extra-$(CONFIG_DRM_I915_WERROR) += \ + always-$(CONFIG_DRM_I915_WERROR) += \ $(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \ $(shell cd $(srctree)/$(src) && find * -name '*.h'))) diff --cc scripts/Makefile.lib index 9f2531567c0e,d5ec3864b318..eee59184de64 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@@ -81,14 -73,12 +73,14 @@@ always-y += $(userprogs-always-y) $(use # DTB # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built - extra-y += $(dtb-y) - extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-) + always-y += $(dtb-y) + always-$(CONFIG_OF_ALL_DTBS) += $(dtb-) ifneq ($(CHECK_DTBS),) - extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y)) - extra-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y)) - extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-)) - extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-)) + always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y)) ++always-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y)) + always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-)) ++always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-)) endif # Add subdir path