# git rev-parse -q --verify 8b7f59de92ac65aa21c7d779274dbfa577ae2d2c^{commit} 8b7f59de92ac65aa21c7d779274dbfa577ae2d2c already have revision, skipping fetch # git checkout -q -f -B kisskb 8b7f59de92ac65aa21c7d779274dbfa577ae2d2c # git clean -qxdf # < git log -1 # commit 8b7f59de92ac65aa21c7d779274dbfa577ae2d2c # Author: Michael Ellerman # Date: Sat Jul 6 22:08:33 2024 +1000 # # selftests/powerpc: Fix build with USERCFLAGS set # # Currently building the powerpc selftests with USERCFLAGS set to anything # causes the build to break: # # $ make -C tools/testing/selftests/powerpc V=1 USERCFLAGS=-Wno-error # ... # gcc -Wno-error cache_shape.c ... # cache_shape.c:18:10: fatal error: utils.h: No such file or directory # 18 | #include "utils.h" # | ^~~~~~~~~ # compilation terminated. # # This happens because the USERCFLAGS are added to CFLAGS in lib.mk, which # causes the check of CFLAGS in powerpc/flags.mk to skip setting CFLAGS at # all, resulting in none of the usual CFLAGS being passed. That can # be seen in the output above, the only flag passed to the compiler is # -Wno-error. # # Fix it by dropping the conditional setting of CFLAGS in flags.mk. # Instead always set CFLAGS, but also append USERCFLAGS if they are set. # # Note that appending to CFLAGS (with +=) wouldn't work, because flags.mk # is included by multiple Makefiles (to support partial builds), causing # CFLAGS to be appended to multiple times. Additionally that would place # the USERCFLAGS prior to the standard CFLAGS, meaning the USERCFLAGS # couldn't override the standard flags. Being able to override the # standard flags is desirable, for example for adding -Wno-error. # # With the fix in place, the CFLAGS are set correctly, including the # USERCFLAGS: # # $ make -C tools/testing/selftests/powerpc V=1 USERCFLAGS=-Wno-error # ... # gcc -std=gnu99 -O2 -Wall -Werror -DGIT_VERSION='"v6.10-rc2-7-gdea17e7e56c3"' # -I/home/michael/linux/tools/testing/selftests/powerpc/include -Wno-error # cache_shape.c ... # # Fixes: 5553a79387e9 ("selftests/powerpc: Add flags.mk to support pmu buildable") # Signed-off-by: Michael Ellerman # Link: https://msgid.link/20240706120833.909853-1-mpe@ellerman.id.au # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 8b7f59de92ac65aa21c7d779274dbfa577ae2d2c # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig Using /kisskb/src/arch/powerpc/configs/mpc85xx_base.config as base Merging /kisskb/src/arch/powerpc/configs/85xx-32bit.config Merging /kisskb/src/arch/powerpc/configs/85xx-hw.config Merging /kisskb/src/arch/powerpc/configs/fsl-emb-nonhw.config # # merged configuration written to .config (needs make) # # Added to kconfig CONFIG_PPC_E500MC=y # Added to kconfig CONFIG_VIRTUALIZATION=y # Added to kconfig CONFIG_KVM_E500MC=y # Added to kconfig # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4597:warning: override: reassigning to symbol PPC_E500MC .config:4598:warning: override: reassigning to symbol VIRTUALIZATION # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/build_bug.h:5, from /kisskb/src/include/linux/container_of.h:5, from /kisskb/src/include/linux/list.h:5, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:28:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 28 | #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) | ^ /kisskb/src/include/linux/compiler.h:77:45: note: in definition of macro 'unlikely' 77 | # define unlikely(x) __builtin_expect(!!(x), 0) | ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:138:13: note: in expansion of macro 'IS_ERR_VALUE' 138 | if (IS_ERR_VALUE(fep->ring_mem_addr)) | ^~~~~~~~~~~~ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi:154.11-204.6: Warning (interrupt_provider): /pcie@e000b000/pcie@0/uli1575@0/isa@1e: '#interrupt-cells' found, but node is not an interrupt provider arch/powerpc/boot/dts/fsl/mpc8544ds.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider' /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8572ds.dtsi:375.11-425.6: Warning (interrupt_provider): /pcie@ffe08000/pcie@0/uli1575@0/isa@1e: '#interrupt-cells' found, but node is not an interrupt provider arch/powerpc/boot/dts/fsl/mpc8572ds.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider' Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc13 # Build took: 0:02:30.136119