# 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-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 8b7f59de92ac65aa21c7d779274dbfa577ae2d2c # make -s -j 40 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_ge_imp3a_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 85xx/ge_imp3a_defconfig # < make -s -j 40 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_ge_imp3a_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 40 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_ge_imp3a_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 40 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_ge_imp3a_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_spin_lock' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(spin, raw_spinlock); ^ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_spin_lock_irqsave' [-Wmissing-prototypes] unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(spin, raw_spinlock); ^ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_spin_lock_irq' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(spin, raw_spinlock); ^ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_spin_lock_bh' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(spin, raw_spinlock); ^ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_read_lock' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(read, rwlock); ^ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_read_lock_irqsave' [-Wmissing-prototypes] unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(read, rwlock); ^ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_read_lock_irq' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(read, rwlock); ^ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_read_lock_bh' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(read, rwlock); ^ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_write_lock' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(write, rwlock); ^ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_write_lock_irqsave' [-Wmissing-prototypes] unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(write, rwlock); ^ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_write_lock_irq' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(write, rwlock); ^ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_write_lock_bh' [-Wmissing-prototypes] void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ ^ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' BUILD_LOCK_OPS(write, rwlock); ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' Completed OK # rm -rf /kisskb/build/powerpc-fixes_85xx_ge_imp3a_defconfig_powerpc-gcc5 # Build took: 0:00:43.788839