# git rev-parse -q --verify 2df76606db9de579bc96725981db4e8daa281993^{commit} 2df76606db9de579bc96725981db4e8daa281993 already have revision, skipping fetch # git checkout -q -f -B kisskb 2df76606db9de579bc96725981db4e8daa281993 # git clean -qxdf # < git log -1 # commit 2df76606db9de579bc96725981db4e8daa281993 # Merge: 2fcd8f108f25 0a6de78cff60 # Author: Linus Torvalds # Date: Sun Oct 16 11:12:22 2022 -0700 # # Merge tag 'kbuild-fixes-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild # # Pull Kbuild fixes from Masahiro Yamada: # # - Fix CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y compile error for the # combination of Clang >= 14 and GAS <= 2.35. # # - Drop vmlinux.bz2 from the rpm package as it just annoyingly increased # the package size. # # - Fix modpost error under build environments using musl. # # - Make *.ll files keep value names for easier debugging # # - Fix single directory build # # - Prevent RISC-V from selecting the broken DWARF5 support when Clang # and GAS are used together. # # * tag 'kbuild-fixes-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: # lib/Kconfig.debug: Add check for non-constant .{s,u}leb128 support to DWARF5 # kbuild: fix single directory build # kbuild: add -fno-discard-value-names to cmd_cc_ll_c # scripts/clang-tools: Convert clang-tidy args to list # modpost: put modpost options before argument # kbuild: Stop including vmlinux.bz2 in the rpm's # Kconfig.debug: add toolchain checks for DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT # Kconfig.debug: simplify the dependency of DEBUG_INFO_DWARF4/5 # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 2df76606db9de579bc96725981db4e8daa281993 # < make -s -j 40 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- randconfig # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 40 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 40 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig # make -s -j 40 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- In file included from /kisskb/src/arch/arm64/include/asm/cache.h:33:0, from /kisskb/src/include/linux/cache.h:6, from /kisskb/src/include/linux/time.h:5, from /kisskb/src/include/linux/ktime.h:24, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/workqueue.h:9, from /kisskb/src/include/linux/bpf.h:10, from /kisskb/src/arch/arm64/kernel/proton-pack.c:21: /kisskb/src/arch/arm64/kernel/proton-pack.c: In function 'spectre_bhb_loop_affected': /kisskb/src/arch/arm64/include/asm/cputype.h:44:2: error: initializer element is not constant (((imp) << MIDR_IMPLEMENTOR_SHIFT) | \ ^ /kisskb/src/arch/arm64/include/asm/cputype.h:208:12: note: in definition of macro 'MIDR_RANGE' .model = m, \ ^ /kisskb/src/arch/arm64/kernel/proton-pack.c:872:4: note: in expansion of macro 'MIDR_ALL_VERSIONS' MIDR_ALL_VERSIONS(MIDR_AMPERE1), ^ /kisskb/src/arch/arm64/include/asm/cputype.h:178:22: note: in expansion of macro 'MIDR_CPU_MODEL' #define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1) ^ /kisskb/src/arch/arm64/kernel/proton-pack.c:872:22: note: in expansion of macro 'MIDR_AMPERE1' MIDR_ALL_VERSIONS(MIDR_AMPERE1), ^ /kisskb/src/arch/arm64/include/asm/cputype.h:44:2: note: (near initialization for 'spectre_bhb_k11_list[0].model') (((imp) << MIDR_IMPLEMENTOR_SHIFT) | \ ^ /kisskb/src/arch/arm64/include/asm/cputype.h:208:12: note: in definition of macro 'MIDR_RANGE' .model = m, \ ^ /kisskb/src/arch/arm64/kernel/proton-pack.c:872:4: note: in expansion of macro 'MIDR_ALL_VERSIONS' MIDR_ALL_VERSIONS(MIDR_AMPERE1), ^ /kisskb/src/arch/arm64/include/asm/cputype.h:178:22: note: in expansion of macro 'MIDR_CPU_MODEL' #define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1) ^ /kisskb/src/arch/arm64/kernel/proton-pack.c:872:22: note: in expansion of macro 'MIDR_AMPERE1' MIDR_ALL_VERSIONS(MIDR_AMPERE1), ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:250: arch/arm64/kernel/proton-pack.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: arch/arm64/kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/arm64] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1992: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 40 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5 # Build took: 0:03:38.638084