Skip to content

Commit fd6f57b

Browse files
committed
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 ...
2 parents 0ed9059 + c4d7f40 commit fd6f57b

File tree

57 files changed

+243
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+243
-367
lines changed

Documentation/kbuild/kconfig-language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ applicable everywhere (see syntax).
176176
y y y Y/m/n
177177
n m n N/m
178178
m m m M/n
179-
y m n M/n
179+
y m m M/n
180180
y n * N
181181
=== === ============= ==============
182182

Documentation/process/changes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ you probably needn't concern yourself with pcmciautils.
3030
Program Minimal version Command to check the version
3131
====================== =============== ========================================
3232
GNU C 5.1 gcc --version
33-
Clang/LLVM (optional) 10.0.1 clang --version
33+
Clang/LLVM (optional) 11.0.0 clang --version
3434
GNU make 3.81 make --version
3535
binutils 2.23 ld -v
3636
flex 2.5.35 flex --version

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4467,7 +4467,6 @@ L: keyrings@vger.kernel.org
44674467
S: Maintained
44684468
F: Documentation/admin-guide/module-signing.rst
44694469
F: certs/
4470-
F: scripts/extract-cert.c
44714470
F: scripts/sign-file.c
44724471

44734472
CFAG12864B LCD DRIVER

Makefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,15 +1278,6 @@ headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts
12781278
$(Q)$(MAKE) $(hdr-inst)=include/uapi
12791279
$(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi
12801280

1281-
# Deprecated. It is no-op now.
1282-
PHONY += headers_check
1283-
headers_check:
1284-
@echo >&2 "=================== WARNING ==================="
1285-
@echo >&2 "Since Linux 5.5, 'make headers_check' is no-op,"
1286-
@echo >&2 "and will be removed after Linux 5.15 release."
1287-
@echo >&2 "Please remove headers_check from your scripts."
1288-
@echo >&2 "==============================================="
1289-
12901281
ifdef CONFIG_HEADERS_INSTALL
12911282
prepare: headers
12921283
endif
@@ -1497,7 +1488,7 @@ MRPROPER_FILES += include/config include/generated \
14971488
debian snap tar-install \
14981489
.config .config.old .version \
14991490
Module.symvers \
1500-
certs/signing_key.pem certs/signing_key.x509 \
1491+
certs/signing_key.pem \
15011492
certs/x509.genkey \
15021493
vmlinux-gdb.py \
15031494
*.spec
@@ -1723,9 +1714,9 @@ PHONY += prepare
17231714
# now expand this into a simple variable to reduce the cost of shell evaluations
17241715
prepare: CC_VERSION_TEXT := $(CC_VERSION_TEXT)
17251716
prepare:
1726-
@if [ "$(CC_VERSION_TEXT)" != $(CONFIG_CC_VERSION_TEXT) ]; then \
1717+
@if [ "$(CC_VERSION_TEXT)" != "$(CONFIG_CC_VERSION_TEXT)" ]; then \
17271718
echo >&2 "warning: the compiler differs from the one used to build the kernel"; \
1728-
echo >&2 " The kernel was built by: "$(CONFIG_CC_VERSION_TEXT); \
1719+
echo >&2 " The kernel was built by: $(CONFIG_CC_VERSION_TEXT)"; \
17291720
echo >&2 " You are using: $(CC_VERSION_TEXT)"; \
17301721
fi
17311722

arch/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,7 @@ config ARCH_SUPPORTS_LTO_CLANG_THIN
648648

649649
config HAS_LTO_CLANG
650650
def_bool y
651-
# Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510
652-
depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD && AS_IS_LLVM
651+
depends on CC_IS_CLANG && LD_IS_LLD && AS_IS_LLVM
653652
depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm)
654653
depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm)
655654
depends on ARCH_SUPPORTS_LTO_CLANG

arch/arc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__
1414
tune-mcpu-def-$(CONFIG_ISA_ARCOMPACT) := -mcpu=arc700
1515
tune-mcpu-def-$(CONFIG_ISA_ARCV2) := -mcpu=hs38
1616

17-
ifeq ($(CONFIG_ARC_TUNE_MCPU),"")
17+
ifeq ($(CONFIG_ARC_TUNE_MCPU),)
1818
cflags-y += $(tune-mcpu-def-y)
1919
else
20-
tune-mcpu := $(shell echo $(CONFIG_ARC_TUNE_MCPU))
20+
tune-mcpu := $(CONFIG_ARC_TUNE_MCPU)
2121
ifneq ($(call cc-option,$(tune-mcpu)),)
2222
cflags-y += $(tune-mcpu)
2323
else

arch/arc/boot/dts/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Built-in dtb
33
builtindtb-y := nsim_700
44

5-
ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"")
6-
builtindtb-y := $(patsubst "%",%,$(CONFIG_ARC_BUILTIN_DTB_NAME))
5+
ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),)
6+
builtindtb-y := $(CONFIG_ARC_BUILTIN_DTB_NAME)
77
endif
88

99
obj-y += $(builtindtb-y).dtb.o

arch/arm/Kconfig.debug

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ config UNWINDER_FRAME_POINTER
6666
config UNWINDER_ARM
6767
bool "ARM EABI stack unwinder"
6868
depends on AEABI && !FUNCTION_GRAPH_TRACER
69-
# https://github.com/ClangBuiltLinux/linux/issues/732
70-
depends on !LD_IS_LLD || LLD_VERSION >= 110000
7169
select ARM_UNWIND
7270
help
7371
This option enables stack unwinding support in the kernel

arch/arm/boot/compressed/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ CPPFLAGS_vmlinux.lds += -DTEXT_OFFSET="$(TEXT_OFFSET)"
7676
CPPFLAGS_vmlinux.lds += -DMALLOC_SIZE="$(MALLOC_SIZE)"
7777

7878
compress-$(CONFIG_KERNEL_GZIP) = gzip
79-
compress-$(CONFIG_KERNEL_LZO) = lzo
80-
compress-$(CONFIG_KERNEL_LZMA) = lzma
81-
compress-$(CONFIG_KERNEL_XZ) = xzkern
82-
compress-$(CONFIG_KERNEL_LZ4) = lz4
79+
compress-$(CONFIG_KERNEL_LZO) = lzo_with_size
80+
compress-$(CONFIG_KERNEL_LZMA) = lzma_with_size
81+
compress-$(CONFIG_KERNEL_XZ) = xzkern_with_size
82+
compress-$(CONFIG_KERNEL_LZ4) = lz4_with_size
8383

8484
libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o
8585

arch/h8300/boot/compressed/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ $(obj)/vmlinux.bin: vmlinux FORCE
3030

3131
suffix-$(CONFIG_KERNEL_GZIP) := gzip
3232
suffix-$(CONFIG_KERNEL_LZO) := lzo
33+
compress-$(CONFIG_KERNEL_GZIP) := gzip
34+
compress-$(CONFIG_KERNEL_LZO) := lzo_with_size
3335

3436
$(obj)/vmlinux.bin.$(suffix-y): $(obj)/vmlinux.bin FORCE
35-
$(call if_changed,$(suffix-y))
37+
$(call if_changed,$(compress-y))
3638

3739
LDFLAGS_piggy.o := -r --format binary --oformat elf32-h8300-linux -T
3840
OBJCOPYFLAGS := -O binary

0 commit comments

Comments
 (0)