Merge tag 'kbuild-fixes-v6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

+3 -3

Documentation/kbuild/Kconfig.recursion-issue-01

··· 16 16 # that are possible for CORE. So for example if CORE_BELL_A_ADVANCED is 'y', 17 17 # CORE must be 'y' too. 18 18 # 19 - # * What influences CORE_BELL_A_ADVANCED ? 19 + # * What influences CORE_BELL_A_ADVANCED? 20 20 # 21 21 # As the name implies CORE_BELL_A_ADVANCED is an advanced feature of 22 22 # CORE_BELL_A so naturally it depends on CORE_BELL_A. So if CORE_BELL_A is 'y' 23 23 # we know CORE_BELL_A_ADVANCED can be 'y' too. 24 24 # 25 - # * What influences CORE_BELL_A ? 25 + # * What influences CORE_BELL_A? 26 26 # 27 27 # CORE_BELL_A depends on CORE, so CORE influences CORE_BELL_A. 28 28 # ··· 34 34 # the "recursive dependency detected" error. 35 35 # 36 36 # Reading the Documentation/kbuild/Kconfig.recursion-issue-01 file it may be 37 - # obvious that an easy to solution to this problem should just be the removal 37 + # obvious that an easy solution to this problem should just be the removal 38 38 # of the "select CORE" from CORE_BELL_A_ADVANCED as that is implicit already 39 39 # since CORE_BELL_A depends on CORE. Recursive dependency issues are not always 40 40 # so trivial to resolve, we provide another example below of practical

+6 -6

Makefile

··· 294 294 single-build := 295 295 296 296 ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) 297 - ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),) 297 + ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),) 298 298 need-config := 299 - endif 299 + endif 300 300 endif 301 301 302 302 ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),) 303 - ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),) 303 + ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),) 304 304 may-sync-config := 305 - endif 305 + endif 306 306 endif 307 307 308 308 need-compiler := $(may-sync-config) ··· 323 323 # We cannot build single targets and the others at the same time 324 324 ifneq ($(filter $(single-targets), $(MAKECMDGOALS)),) 325 325 single-build := 1 326 - ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),) 326 + ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),) 327 327 mixed-build := 1 328 - endif 328 + endif 329 329 endif 330 330 331 331 # For "make -j clean all", "make -j mrproper defconfig all", etc.

+2 -2

arch/m68k/Makefile

··· 15 15 KBUILD_DEFCONFIG := multi_defconfig 16 16 17 17 ifdef cross_compiling 18 - ifeq ($(CROSS_COMPILE),) 18 + ifeq ($(CROSS_COMPILE),) 19 19 CROSS_COMPILE := $(call cc-cross-prefix, \ 20 20 m68k-linux-gnu- m68k-linux- m68k-unknown-linux-gnu-) 21 - endif 21 + endif 22 22 endif 23 23 24 24 #

+2 -2

arch/parisc/Makefile

··· 50 50 51 51 # Set default cross compiler for kernel build 52 52 ifdef cross_compiling 53 - ifeq ($(CROSS_COMPILE),) 53 + ifeq ($(CROSS_COMPILE),) 54 54 CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux 55 55 CROSS_COMPILE := $(call cc-cross-prefix, \ 56 56 $(foreach a,$(CC_ARCHES), \ 57 57 $(foreach s,$(CC_SUFFIXES),$(a)-$(s)-))) 58 - endif 58 + endif 59 59 endif 60 60 61 61 ifdef CONFIG_DYNAMIC_FTRACE

+4 -4

arch/x86/Makefile

··· 112 112 # temporary until string.h is fixed 113 113 KBUILD_CFLAGS += -ffreestanding 114 114 115 - ifeq ($(CONFIG_STACKPROTECTOR),y) 116 - ifeq ($(CONFIG_SMP),y) 115 + ifeq ($(CONFIG_STACKPROTECTOR),y) 116 + ifeq ($(CONFIG_SMP),y) 117 117 KBUILD_CFLAGS += -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard 118 - else 118 + else 119 119 KBUILD_CFLAGS += -mstack-protector-guard=global 120 - endif 121 120 endif 121 + endif 122 122 else 123 123 BITS := 64 124 124 UTS_MACHINE := x86_64

+1 -1

scripts/clang-tools/gen_compile_commands.py

··· 170 170 # escape the pound sign '#', either as '\#' or '$(pound)' (depending on the 171 171 # kernel version). The compile_commands.json file is not interepreted 172 172 # by Make, so this code replaces the escaped version with '#'. 173 - prefix = command_prefix.replace('\#', '#').replace('$(pound)', '#') 173 + prefix = command_prefix.replace(r'\#', '#').replace('$(pound)', '#') 174 174 175 175 # Return the canonical path, eliminating any symbolic links encountered in the path. 176 176 abs_path = os.path.realpath(os.path.join(root_directory, file_path))

+7 -2

scripts/link-vmlinux.sh

··· 135 135 ${OBJCOPY} --only-section=.BTF --set-section-flags .BTF=alloc,readonly \ 136 136 --strip-all ${1} ${2} 2>/dev/null 137 137 # Change e_type to ET_REL so that it can be used to link final vmlinux. 138 - # Unlike GNU ld, lld does not allow an ET_EXEC input. 139 - printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none 138 + # GNU ld 2.35+ and lld do not allow an ET_EXEC input. 139 + if is_enabled CONFIG_CPU_BIG_ENDIAN; then 140 + et_rel='\0\1' 141 + else 142 + et_rel='\1\0' 143 + fi 144 + printf "${et_rel}" | dd of=${2} conv=notrunc bs=1 seek=16 status=none 140 145 } 141 146 142 147 # Create ${2} .S file with all symbols from the ${1} object file

+2 -11

scripts/mksysmap

··· 48 48 / __kvm_nvhe_\\$/d 49 49 / __kvm_nvhe_\.L/d 50 50 51 - # arm64 lld 52 - / __AArch64ADRPThunk_/d 53 - 54 - # arm lld 55 - / __ARMV5PILongThunk_/d 56 - / __ARMV7PILongThunk_/d 57 - / __ThumbV7PILongThunk_/d 58 - 59 - # mips lld 60 - / __LA25Thunk_/d 61 - / __microLA25Thunk_/d 51 + # lld arm/aarch64/mips thunks 52 + / __[[:alnum:]]*Thunk_/d 62 53 63 54 # CFI type identifiers 64 55 / __kcfi_typeid_/d

+6 -1

scripts/mod/sumversion.c

··· 326 326 327 327 /* Sum all files in the same dir or subdirs. */ 328 328 while ((line = get_line(&pos))) { 329 - char* p = line; 329 + char* p; 330 + 331 + /* trim the leading spaces away */ 332 + while (isspace(*line)) 333 + line++; 334 + p = line; 330 335 331 336 if (strncmp(line, "source_", sizeof("source_")-1) == 0) { 332 337 p = strrchr(line, ' ');

Configure Feed

Configure Feed