kbuild: strive to avoid $(shell ...) invocations
Subsystems (17)
cover kbuild: strive to avoid $(shell ...) invocations
$(shell ...) forks process(es).
Built-in functions are more efficient.
Masahiro Yamada (6):
kbuild: add test-{le,ge,lt,gt} macros
kbuild: make CONFIG_*_VERSION always 6-digit
kbuild: implement {gcc,clang}-min-version only with built-in functions
kbuild: add read-file macro
kconfig: refactor Makefile to reduce process forks
kbuild: check Make version
Documentation/kbuild/makefiles.rst | 6 +-- Makefile | 9 +++-- arch/arm/mach-rpc/Kconfig | 2 +- arch/arm64/Kconfig | 4 +- arch/mips/vdso/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/riscv/Kconfig | 4 +- arch/riscv/Makefile | 2 +- arch/x86/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- init/Kconfig | 18 ++++----- lib/Kconfig.debug | 6 +-- lib/Kconfig.kasan | 2 +- scripts/Kbuild.include | 22 +++++++++++ scripts/Makefile.compiler | 6 +-- scripts/Makefile.modfinal | 2 +- scripts/Makefile.modinst | 2 +- scripts/as-version.sh | 6 +-- scripts/cc-version.sh | 6 +-- scripts/kconfig/.gitignore | 4 +- scripts/kconfig/Makefile | 43 +++++++++++---------- scripts/kconfig/gconf-cfg.sh | 7 +++- scripts/kconfig/mconf-cfg.sh | 25 ++++++------ scripts/kconfig/nconf-cfg.sh | 23 ++++++----- scripts/kconfig/qconf-cfg.sh | 10 +++-- scripts/ld-version.sh | 6 +-- scripts/remove-stale-files | 2 + 27 files changed, 135 insertions(+), 90 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/6 kbuild: add test-{le,ge,lt,gt} macros
Because GNU Make is only able to handle strings, it is very hard to perform arighmetic in Makefiles.
When we compare two integers, we invokes shell. One example is in the top Makefile:
ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)
This is more expensive than using built-in functions since it forks a process.
If we know the two have the same number of digits, we can do better.
This commit adds four macros, test-le, test-ge, test-lt, test-gt.
$(call test-lt, A, B) is evaluated to 'y' if A is less than B, or empty otherwise. This will replace $(call shell test A -lt B).
Again, the limitation is that A and B must have the same number of digits because these macros are based on $(sort ) function.
$(call test-lt, 1, 9) --> y (Works!) $(call test-lt, 10, 9) --> y (Not work...)
To make the latter work, you need to add '0' prefix to align the number of digits:
$(call test-lt, 10, 09) --> empty (Works!)
Actually, we can live with this limitation in many places. As for the example above, we know $(CONFIG_LLD_VERSION) is 6-digits because the minimal supported version of LLVM is 11.0.0.
So, the shell invocation can be replaced with more efficient code:
ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)
Of course, this assumption will break when LLVM 100 is released, but it will be far in the future.
---
Makefile | 2 +- arch/riscv/Makefile | 2 +- arch/x86/Makefile | 2 +- scripts/Kbuild.include | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-)
Makefile +1 -1
@@ -986,7 +986,7 @@ KBUILD_LDFLAGS += -mllvm -import-instr-limit=5 # Check for frame size exceeding threshold during prolog/epilog insertion # when using lld < 13.0.0. ifneq ($(CONFIG_FRAME_WARN),0) -ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0) +ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) KBUILD_LDFLAGS += -plugin-opt=-warn-stack-size=$(CONFIG_FRAME_WARN) endif endif
arch/riscv/Makefile +1 -1
@@ -37,7 +37,7 @@ else endif ifeq ($(CONFIG_LD_IS_LLD),y) -ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 150000; echo $$?),0) +ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y) KBUILD_CFLAGS += -mno-relax KBUILD_AFLAGS += -mno-relax ifndef CONFIG_AS_IS_LLVM
arch/x86/Makefile +1 -1
@@ -211,7 +211,7 @@ endif KBUILD_LDFLAGS += -m elf_$(UTS_MACHINE) ifdef CONFIG_LTO_CLANG -ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0) +ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) KBUILD_LDFLAGS += -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8) endif endif
scripts/Kbuild.include +10 -0
@@ -11,6 +11,16 @@ space := $(empty) $(empty) space_escape := _-_SPACE_-_ pound := \# +### +# Comparison macros. +# Usage: $(call test-le, A, B) +# works like shell's "test A -le B", but A and B must have the same number of +# digits since it is just ASCII sort. +test-le = $(if $(filter $1, $(firstword $(sort $1 $2))),y) +test-ge = $(call test-le, $2, $1) +test-lt = $(if $(filter-out $2, $(firstword $(sort $1 $2))),y) +test-gt = $(call test-lt, $2, $1) + ### # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o dot-target = $(dir $@).$(notdir $@)
Signature · 1 line
2.34.1
Re: [PATCH 1/6] kbuild: add test-{le,ge,lt,gt} macros
Quoted 3 lines · Masahiro Yamada
Because GNU Make is only able to handle strings, it is very hard to perform arighmetic in Makefiles.
arighmetic -> arithmetic
Quoted 2 lines
When we compare two integers, we invokes shell. One example is in the
invokes -> invoke
Quoted 38 lines
top
Makefile:ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)This is more expensive than using built-in functions since it forks a process.
If we know the two have the same number of digits, we can do better.
This commit adds four macros, test-le, test-ge, test-lt, test-gt.
$(call test-lt, A, B) is evaluated to 'y' if A is less than B, or empty otherwise. This will replace $(call shell test A -lt B).
Again, the limitation is that A and B must have the same number of digits because these macros are based on $(sort ) function.
$(call test-lt, 1, 9) --> y (Works!) $(call test-lt, 10, 9) --> y (Not work...)To make the latter work, you need to add '0' prefix to align the number of digits:
$(call test-lt, 10, 09) --> empty (Works!)Actually, we can live with this limitation in many places. As for the example above, we know $(CONFIG_LLD_VERSION) is 6-digits because the minimal supported version of LLVM is 11.0.0.
So, the shell invocation can be replaced with more efficient code:
ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)Of course, this assumption will break when LLVM 100 is released, but it will be far in the future.
Signed-off-by Masahiro Yamada <[email protected]>---
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 2/6 kbuild: make CONFIG_*_VERSION always 6-digit
In reply to Masahiro YamadaCONFIG_*_VERSION is the version number of a tool in a 5 or 6-digit form. This is fine in the Kconfig perspective because Kconfig supports numeric comparison (<, <=, >, >=).
It is harder in Makefiles due to make's limited numerical capabilities. So, we ask for shell's "test" command when we compare versions, but it needs some process forks.
test-{le,ge,lt,gt} macros can compare versions by using only built-in functions, but the number of digits must be aligned for those macros to work correctly.
This commit (ab)uses Kconfig's hex type, which allows '0' prefixes, in order to make CONFIG_*_VERSION always 6-digit.
For example with GCC 9.5, CONFIG_GCC_VERSION=90500 will be turned into CONFIG_GCC_VERSION=090500.
I touched several Kconfig files so that versions are consistently compared against 6-digit numbers although this is not mandated.
---
arch/arm/mach-rpc/Kconfig | 2 +- arch/arm64/Kconfig | 4 ++-- arch/mips/vdso/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/riscv/Kconfig | 4 ++-- init/Kconfig | 18 +++++++++--------- lib/Kconfig.debug | 6 +++--- lib/Kconfig.kasan | 2 +- scripts/as-version.sh | 6 +++--- scripts/cc-version.sh | 6 +++--- scripts/ld-version.sh | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-)
arch/arm/mach-rpc/Kconfig +1 -1
@@ -2,7 +2,7 @@ config ARCH_RPC bool "RiscPC" depends on ARCH_MULTI_V4 && !(ARCH_MULTI_V4T || ARCH_MULTI_V5) depends on !(ARCH_FOOTBRIDGE || ARCH_SA1100 || ARCH_MOXART || ARCH_GEMINI) - depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000 + depends on !CC_IS_CLANG && GCC_VERSION < 090100 && GCC_VERSION >= 060000 depends on CPU_LITTLE_ENDIAN depends on ATAGS depends on MMU
arch/arm64/Kconfig +2 -2
@@ -236,7 +236,7 @@ config ARM64 config CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS def_bool CC_IS_CLANG # https://github.com/ClangBuiltLinux/linux/issues/1507 - depends on AS_IS_GNU || (AS_IS_LLVM && (LD_IS_LLD || LD_VERSION >= 23600)) + depends on AS_IS_GNU || (AS_IS_LLVM && (LD_IS_LLD || LD_VERSION >= 023600)) select HAVE_DYNAMIC_FTRACE_WITH_REGS config GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS
@@ -1814,7 +1814,7 @@ config ARM64_PTR_AUTH_KERNEL depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC # Modern compilers insert a .note.gnu.property section note for PAC # which is only understood by binutils starting with version 2.33.1. - depends on LD_IS_LLD || LD_VERSION >= 23301 || (CC_IS_GCC && GCC_VERSION < 90100) + depends on LD_IS_LLD || LD_VERSION >= 23301 || (CC_IS_GCC && GCC_VERSION < 090100) depends on !CC_IS_CLANG || AS_HAS_CFI_NEGATE_RA_STATE depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS) help
arch/mips/vdso/Kconfig +1 -1
@@ -12,7 +12,7 @@ # the lack of relocations. As such, we disable the VDSO for microMIPS builds. config MIPS_LD_CAN_LINK_VDSO - def_bool LD_VERSION >= 22500 || LD_IS_LLD + def_bool LD_VERSION >= 022500 || LD_IS_LLD config MIPS_DISABLE_VDSO def_bool CPU_MICROMIPS || (!CPU_MIPSR6 && !MIPS_LD_CAN_LINK_VDSO)
arch/powerpc/Kconfig +1 -1
@@ -220,7 +220,7 @@ config PPC select HAVE_FUNCTION_ERROR_INJECTION select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER - select HAVE_GCC_PLUGINS if GCC_VERSION >= 50200 # plugin support on gcc <= 5.1 is buggy on PPC + select HAVE_GCC_PLUGINS if GCC_VERSION >= 050200 # plugin support on gcc <= 5.1 is buggy on PPC select HAVE_GENERIC_VDSO select HAVE_HARDLOCKUP_DETECTOR_ARCH if PPC_BOOK3S_64 && SMP select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH
arch/riscv/Kconfig +2 -2
@@ -416,7 +416,7 @@ config TOOLCHAIN_HAS_ZICBOM default y depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zicbom) depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zicbom) - depends on LLD_VERSION >= 150000 || LD_VERSION >= 23800 + depends on LLD_VERSION >= 150000 || LD_VERSION >= 023800 config RISCV_ISA_ZICBOM bool "Zicbom extension support for non-coherent DMA operation"
@@ -440,7 +440,7 @@ config TOOLCHAIN_HAS_ZIHINTPAUSE default y depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zihintpause) depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zihintpause) - depends on LLD_VERSION >= 150000 || LD_VERSION >= 23600 + depends on LLD_VERSION >= 150000 || LD_VERSION >= 023600 config FPU bool "FPU support"
init/Kconfig +9 -9
@@ -20,17 +20,17 @@ config CC_IS_GCC def_bool $(success,test "$(cc-name)" = GCC) config GCC_VERSION - int + hex default $(cc-version) if CC_IS_GCC - default 0 + default 000000 config CC_IS_CLANG def_bool $(success,test "$(cc-name)" = Clang) config CLANG_VERSION - int + hex default $(cc-version) if CC_IS_CLANG - default 0 + default 000000 config AS_IS_GNU def_bool $(success,test "$(as-name)" = GNU)
@@ -39,7 +39,7 @@ config AS_IS_LLVM def_bool $(success,test "$(as-name)" = LLVM) config AS_VERSION - int + hex # Use clang version if this is the integrated assembler default CLANG_VERSION if AS_IS_LLVM default $(as-version)
@@ -48,17 +48,17 @@ config LD_IS_BFD def_bool $(success,test "$(ld-name)" = BFD) config LD_VERSION - int + hex default $(ld-version) if LD_IS_BFD - default 0 + default 000000 config LD_IS_LLD def_bool $(success,test "$(ld-name)" = LLD) config LLD_VERSION - int + hex default $(ld-version) if LD_IS_LLD - default 0 + default 000000 config RUST_IS_AVAILABLE def_bool $(success,$(srctree)/scripts/rust_is_available.sh)
lib/Kconfig.debug +3 -3
@@ -258,7 +258,7 @@ config DEBUG_INFO_NONE config DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT bool "Rely on the toolchain's implicit default DWARF version" select DEBUG_INFO - depends on !CC_IS_CLANG || AS_IS_LLVM || CLANG_VERSION < 140000 || (AS_IS_GNU && AS_VERSION >= 23502 && AS_HAS_NON_CONST_LEB128) + depends on !CC_IS_CLANG || AS_IS_LLVM || CLANG_VERSION < 140000 || (AS_IS_GNU && AS_VERSION >= 023502 && AS_HAS_NON_CONST_LEB128) help The implicit default version of DWARF debug info produced by a toolchain changes over time.
@@ -270,7 +270,7 @@ config DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT config DEBUG_INFO_DWARF4 bool "Generate DWARF Version 4 debuginfo" select DEBUG_INFO - depends on !CC_IS_CLANG || AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502) + depends on !CC_IS_CLANG || AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 023502) help Generate DWARF v4 debug info. This requires gcc 4.5+, binutils 2.35.2 if using clang without clang's integrated assembler, and gdb 7.0+.
@@ -282,7 +282,7 @@ config DEBUG_INFO_DWARF4 config DEBUG_INFO_DWARF5 bool "Generate DWARF Version 5 debuginfo" select DEBUG_INFO - depends on !CC_IS_CLANG || AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502 && AS_HAS_NON_CONST_LEB128) + depends on !CC_IS_CLANG || AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 023502 && AS_HAS_NON_CONST_LEB128) help Generate DWARF v5 debug info. Requires binutils 2.35.2, gcc 5.0+ (gcc 5.0+ accepts the -gdwarf-5 flag but only had partial support for some
lib/Kconfig.kasan +1 -1
@@ -29,7 +29,7 @@ config CC_HAS_KASAN_SW_TAGS # Old GCC versions do not have proper support for no_sanitize_address. # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89124 for details. config CC_HAS_WORKING_NOSANITIZE_ADDRESS - def_bool !CC_IS_GCC || GCC_VERSION >= 80300 + def_bool !CC_IS_GCC || GCC_VERSION >= 080300 menuconfig KASAN bool "KASAN: dynamic memory safety error detector"
scripts/as-version.sh +3 -3
@@ -1,14 +1,14 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0-only # -# Print the assembler name and its version in a 5 or 6-digit form. +# Print the assembler name and its version in a 6-digit form. # Also, perform the minimum version check. # (If it is the integrated assembler, return 0 as the version, and # skip the version check.) set -e -# Convert the version string x.y.z to a canonical 5 or 6-digit form. +# Convert the version string x.y.z to a canonical 6-digit form. get_canonical_version() { IFS=.
@@ -18,7 +18,7 @@ get_canonical_version() # # The 4th field, if present, is ignored. # This occurs in development snapshots as in 2.35.1.20201116 - echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) + printf "%06d\n" $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) } # Clang fails to handle -Wa,--version unless -fno-integrated-as is given.
scripts/cc-version.sh +3 -3
@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # -# Print the C compiler name and its version in a 5 or 6-digit form. +# Print the C compiler name and its version in a 6-digit form. # Also, perform the minimum version check. set -e
@@ -22,12 +22,12 @@ get_c_compiler_info() EOF } -# Convert the version string x.y.z to a canonical 5 or 6-digit form. +# Convert the version string x.y.z to a canonical 6-digit form. get_canonical_version() { IFS=. set -- $1 - echo $((10000 * $1 + 100 * $2 + $3)) + printf "%06d\n" $((10000 * $1 + 100 * $2 + $3)) } # $@ instead of $1 because multiple words might be given, e.g. CC="ccache gcc".
scripts/ld-version.sh +3 -3
@@ -1,12 +1,12 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # -# Print the linker name and its version in a 5 or 6-digit form. +# Print the linker name and its version in a 6-digit form. # Also, perform the minimum version check. set -e -# Convert the version string x.y.z to a canonical 5 or 6-digit form. +# Convert the version string x.y.z to a canonical 6-digit form. get_canonical_version() { IFS=.
@@ -16,7 +16,7 @@ get_canonical_version() # # The 4th field, if present, is ignored. # This occurs in development snapshots as in 2.35.1.20201116 - echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) + printf "%06d\n" $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) } orig_args="$@"
Signature · 1 line
2.34.1
Re: [PATCH 2/6] kbuild: make CONFIG_*_VERSION always 6-digit
Quoted 16 lines · Masahiro Yamada
CONFIG_*_VERSION is the version number of a tool in a 5 or 6-digit form. This is fine in the
Kconfigperspective becauseKconfigsupports numeric comparison (<, <=, >, >=).It is harder in Makefiles due to make's limited numerical capabilities. So, we ask for shell's "test" command when we compare versions, but it needs some process forks.
test-{le,ge,lt,gt} macros can compare versions by using only built-in functions, but the number of digits must be aligned for those macros to work correctly.
This commit (ab)uses Kconfig's hex type, which allows '0' prefixes, in order to make CONFIG_*_VERSION always 6-digit.
Quoted 7 lines
For example with GCC 9.5,
CONFIG_GCC_VERSION=90500will be turned intoCONFIG_GCC_VERSION=090500.I touched several
Kconfigfiles so that versions are consistently compared against 6-digit numbers although this is not mandated.Signed-off-by Masahiro Yamada <[email protected]>
I terribly missed that CONFIG_*_VERSION changed the meaning in C files (decimal -> octal).
I will drop this in V2.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 3/6 kbuild: implement {gcc,clang}-min-version only with built-in functions
In reply to Masahiro YamadaNow CONFIG_{GCC,CLANG}_VERSION are always 6-digit, replace the shell invocations with the test-ge macro.
Please note gcc-min-version must be used against a 6-digit number. Add '0' prefix.
---
Documentation/kbuild/makefiles.rst | 6 +++--- Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- scripts/Makefile.compiler | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
Documentation/kbuild/makefiles.rst +3 -3
@@ -669,18 +669,18 @@ more details, with real examples. gcc-min-version gcc-min-version tests if the value of $(CONFIG_GCC_VERSION) is greater than - or equal to the provided value and evaluates to y if so. + or equal to the provided value (in 6-digit form) and evaluates to y if so. Example:: - cflags-$(call gcc-min-version, 70100) := -foo + cflags-$(call gcc-min-version, 070100) := -foo In this example, cflags-y will be assigned the value -foo if $(CC) is gcc and $(CONFIG_GCC_VERSION) is >= 7.1. clang-min-version clang-min-version tests if the value of $(CONFIG_CLANG_VERSION) is greater - than or equal to the provided value and evaluates to y if so. + than or equal to the provided value (in 6-digit form) and evaluates to y if so. Example::
Makefile +1 -1
@@ -1050,7 +1050,7 @@ endif # ignored, continuing to default to PTRDIFF_MAX. So, left with no other # choice, we must perform a versioned check to disable this warning. # https://lore.kernel.org/lkml/[email protected] -KBUILD_CFLAGS-$(call gcc-min-version, 90100) += -Wno-alloc-size-larger-than +KBUILD_CFLAGS-$(call gcc-min-version, 090100) += -Wno-alloc-size-larger-than KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH) # disable invalid "can't wrap" optimizations for signed / pointers
drivers/gpu/drm/amd/display/dc/dml/Makefile +1 -1
@@ -34,7 +34,7 @@ dml_ccflags := -mhard-float -maltivec endif ifdef CONFIG_CC_IS_GCC -ifneq ($(call gcc-min-version, 70100),y) +ifneq ($(call gcc-min-version, 070100),y) IS_OLD_GCC = 1 endif endif
scripts/Makefile.compiler +3 -3
@@ -62,12 +62,12 @@ cc-disable-warning = $(call try-run,\ $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1))) # gcc-min-version -# Usage: cflags-$(call gcc-min-version, 70100) += -foo -gcc-min-version = $(shell [ $(CONFIG_GCC_VERSION)0 -ge $(1)0 ] && echo y) +# Usage: cflags-$(call gcc-min-version, 070100) += -foo +gcc-min-version = $(call test-ge, $(CONFIG_GCC_VERSION), $1) # clang-min-version # Usage: cflags-$(call clang-min-version, 110000) += -foo -clang-min-version = $(shell [ $(CONFIG_CLANG_VERSION)0 -ge $(1)0 ] && echo y) +clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1) # ld-option # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y)
Signature · 1 line
2.34.1
PATCH 4/6 kbuild: add read-file macro
In reply to Masahiro YamadaSince GMU Make 4.2, $(file ...) supports the read operater '<', which is useful to read a file without forking any process. No warning is shown even if the input file is missing.
For older Make versions, it falls back to the cat command.
---
Makefile | 2 +- scripts/Kbuild.include | 12 ++++++++++++ scripts/Makefile.modfinal | 2 +- scripts/Makefile.modinst | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-)
Makefile +1 -1
@@ -369,7 +369,7 @@ else # !mixed-build include $(srctree)/scripts/Kbuild.include # Read KERNELRELEASE from include/config/kernel.release (if it exists) -KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) +KERNELRELEASE = $(call read-file, include/config/kernel.release) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
scripts/Kbuild.include +12 -0
@@ -10,6 +10,10 @@ empty := space := $(empty) $(empty) space_escape := _-_SPACE_-_ pound := \# +define newline + + +endef ### # Comparison macros.
@@ -55,6 +59,14 @@ stringify = $(squote)$(quote)$1$(quote)$(squote) kbuild-dir = $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) kbuild-file = $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile) +### +# Read a file, replacing newlines with spaces +ifeq ($(call test-ge, $(MAKE_VERSION), 4.2),y) +read-file = $(subst $(newline),$(space),$(file < $1)) +else +read-file = $(shell cat $1 2>/dev/null) +endif + ### # Easy method for doing a status message kecho := :
scripts/Makefile.modfinal +1 -1
@@ -13,7 +13,7 @@ include $(srctree)/scripts/Kbuild.include include $(srctree)/scripts/Makefile.lib # find all modules listed in modules.order -modules := $(sort $(shell cat $(MODORDER))) +modules := $(sort $(call read-file, $(MODORDER))) __modfinal: $(modules) @:
scripts/Makefile.modinst +1 -1
@@ -9,7 +9,7 @@ __modinst: include include/config/auto.conf include $(srctree)/scripts/Kbuild.include -modules := $(sort $(shell cat $(MODORDER))) +modules := $(sort $(call read-file, $(MODORDER))) ifeq ($(KBUILD_EXTMOD),) dst := $(MODLIB)/kernel
Signature · 1 line
2.34.1
PATCH 5/6 kconfig: refactor Makefile to reduce process forks
In reply to Masahiro YamadaRefactor Makefile and use read-file macro. For Make >= 4.2, it can read out a file by using the built-in function.
---
scripts/kconfig/.gitignore | 4 +++- scripts/kconfig/Makefile | 43 +++++++++++++++++++----------------- scripts/kconfig/gconf-cfg.sh | 7 ++++-- scripts/kconfig/mconf-cfg.sh | 25 ++++++++++++--------- scripts/kconfig/nconf-cfg.sh | 23 ++++++++++--------- scripts/kconfig/qconf-cfg.sh | 10 ++++++--- scripts/remove-stale-files | 2 ++ 7 files changed, 67 insertions(+), 47 deletions(-)
scripts/kconfig/.gitignore +3 -1
@@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only /conf /[gmnq]conf -/[gmnq]conf-cfg +/[gmnq]conf-cflags +/[gmnq]conf-libs +/qconf-bin /qconf-moc.cc
scripts/kconfig/Makefile +23 -20
76 lines not on this page · raw message
scripts/kconfig/gconf-cfg.sh +5 -2
@@ -1,6 +1,9 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 +cflags=$1 +libs=$2 + PKG="gtk+-2.0 gmodule-2.0 libglade-2.0" if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
@@ -26,5 +29,5 @@ if ! ${HOSTPKG_CONFIG} --atleast-version=2.0.0 gtk+-2.0; then exit 1 fi -echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" -echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\" +${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} +${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
scripts/kconfig/mconf-cfg.sh +14 -11
@@ -1,19 +1,22 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 +cflags=$1 +libs=$2 + PKG="ncursesw" PKG2="ncurses" if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then if ${HOSTPKG_CONFIG} --exists $PKG; then - echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" - echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\" + ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} + ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs} exit 0 fi - if ${HOSTPKG_CONFIG} --exists $PKG2; then - echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG2)\" - echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG2)\" + if ${HOSTPKG_CONFIG} --exists ${PKG2}; then + ${HOSTPKG_CONFIG} --cflags ${PKG2} > ${cflags} + ${HOSTPKG_CONFIG} --libs ${PKG2} > ${libs} exit 0 fi fi
@@ -22,22 +25,22 @@ fi # (Even if it is installed, some distributions such as openSUSE cannot # find ncurses by pkg-config.) if [ -f /usr/include/ncursesw/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\" - echo libs=\"-lncursesw\" + echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags} + echo -lncursesw > ${libs} exit 0 fi if [ -f /usr/include/ncurses/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\" - echo libs=\"-lncurses\" + echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags} + echo -lncurses > ${libs} exit 0 fi # As a final fallback before giving up, check if $HOSTCC knows of a default # ncurses installation (e.g. from a vendor-specific sysroot). if echo '#include <ncurses.h>' | ${HOSTCC} -E - >/dev/null 2>&1; then - echo cflags=\"-D_GNU_SOURCE\" - echo libs=\"-lncurses\" + echo -D_GNU_SOURCE > ${cflags} + echo -lncurses > ${libs} exit 0 fi
scripts/kconfig/nconf-cfg.sh +13 -10
@@ -1,19 +1,22 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 +cflags=$1 +libs=$2 + PKG="ncursesw menuw panelw" PKG2="ncurses menu panel" if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then if ${HOSTPKG_CONFIG} --exists $PKG; then - echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" - echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\" + ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} + ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs} exit 0 fi if ${HOSTPKG_CONFIG} --exists $PKG2; then - echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG2)\" - echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG2)\" + ${HOSTPKG_CONFIG} --cflags ${PKG2} > ${cflags} + ${HOSTPKG_CONFIG} --libs ${PKG2} > ${libs} exit 0 fi fi
@@ -22,20 +25,20 @@ fi # (Even if it is installed, some distributions such as openSUSE cannot # find ncurses by pkg-config.) if [ -f /usr/include/ncursesw/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\" - echo libs=\"-lncursesw -lmenuw -lpanelw\" + echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags} + echo -lncursesw -lmenuw -lpanelw > ${libs} exit 0 fi if [ -f /usr/include/ncurses/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\" - echo libs=\"-lncurses -lmenu -lpanel\" + echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags} + echo -lncurses -lmenu -lpanel > ${libs} exit 0 fi if [ -f /usr/include/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE\" - echo libs=\"-lncurses -lmenu -lpanel\" + echo -D_GNU_SOURCE > ${cflags} + echo -lncurses -lmenu -lpanel > ${libs} exit 0 fi
scripts/kconfig/qconf-cfg.sh +7 -3
@@ -1,6 +1,10 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 +cflags=$1 +libs=$2 +bin=$3 + PKG="Qt5Core Qt5Gui Qt5Widgets" if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
@@ -11,9 +15,9 @@ if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then fi if ${HOSTPKG_CONFIG} --exists $PKG; then - echo cflags=\"-std=c++11 -fPIC $(${HOSTPKG_CONFIG} --cflags $PKG)\" - echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\" - echo moc=\"$(${HOSTPKG_CONFIG} --variable=host_bins Qt5Core)/moc\" + ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} + ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs} + ${HOSTPKG_CONFIG} --variable=host_bins Qt5Core > ${bin} exit 0 fi
scripts/remove-stale-files +2 -0
@@ -47,3 +47,5 @@ rm -f arch/riscv/purgatory/kexec-purgatory.c rm -f scripts/extract-cert rm -f arch/x86/purgatory/kexec-purgatory.c + +rm -f scripts/kconfig/[gmnq]conf-cfg
Signature · 1 line
2.34.1
PATCH 6/6 kbuild: check Make version
In reply to Masahiro YamadaThis is implemented based on test-le. It will work until GNU Make 10 is released.
---
Makefile | 3 +++ 1 file changed, 3 insertions(+)
Makefile +3 -0
@@ -368,6 +368,9 @@ else # !mixed-build include $(srctree)/scripts/Kbuild.include +# Check for the minimal Make version +$(if $(call test-lt, $(MAKE_VERSION), 3.82), $(error Make $(MAKE_VERSION) is too old)) + # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(call read-file, include/config/kernel.release) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
Signature · 1 line
2.34.1