1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
linux/tools/testing/selftests/powerpc
Michael Ellerman 8b7f59de92 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: 5553a79387 ("selftests/powerpc: Add flags.mk to support pmu buildable")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240706120833.909853-1-mpe@ellerman.id.au
2024-07-06 22:10:14 +10:00
..
alignment selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
benchmarks selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
cache_shape selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
copyloops selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
dexcr selftests/powerpc/dexcr: Fix spelling mistake "predicition" -> "prediction" 2024-05-08 22:32:22 +10:00
dscr selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
eeh selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
include selftests/powerpc: add const qualification where possible 2023-08-18 17:03:15 +10:00
lib selftests/powerpc/ptrace: Convert to load/store doubles 2022-07-25 12:05:16 +10:00
math selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
mce selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
mm selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
nx-gzip selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
papr_attributes selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
papr_sysparm selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
papr_vpd powerpc updates for 6.10 2024-05-17 09:05:46 -07:00
pmu selftests/powerpc: Install tests in sub-directories 2024-04-29 23:54:43 +10:00
primitives selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
ptrace selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
scripts selftests: powerpc: Use "grep -E" instead of "egrep" 2022-12-02 18:04:27 +11:00
security selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
signal selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
stringloops selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
switch_endian selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
syscalls selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
tm selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
vphn selftests/powerpc: make sub-folders buildable on their own 2024-04-29 23:54:42 +10:00
flags.mk selftests/powerpc: Fix build with USERCFLAGS set 2024-07-06 22:10:14 +10:00
harness.c selftests/powerpc: add const qualification where possible 2023-08-18 17:03:15 +10:00
Makefile selftests/powerpc: Install tests in sub-directories 2024-04-29 23:54:43 +10:00
utils.c selftests/powerpc/dexcr: Add hashst/hashchk test 2023-06-19 17:36:28 +10:00