mips: Fix unroll macro when building with Clang
PATCH 1/1 mips: Fix unroll macro when building with Clang
Building with Clang errors after commit 6baaeadae911 ("MIPS: Provide unroll() macro, use it for cache ops") since the GCC_VERSION macro is defined in include/linux/compiler-gcc.h, which is only included in compiler.h when using GCC:
In file included from arch/mips/kernel/mips-mt.c:20:./arch/mips/include/asm/r4kcache.h:254:1: error: use of undeclared identifier 'GCC_VERSION'; did you mean 'S_VERSION'? __BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, )
^./arch/mips/include/asm/r4kcache.h:219:4: note: expanded from macro '__BUILD_BLAST_CACHE'
cache_unroll(32, kernel_cache, indexop, ^./arch/mips/include/asm/r4kcache.h:203:2: note: expanded from macro 'cache_unroll'
unroll(times, _cache_op, insn, op, (addr) + (i++ * (lsize)));
^
./arch/mips/include/asm/unroll.h:28:15: note: expanded from macro
'unroll'
BUILD_BUG_ON(GCC_VERSION >= 40700 && \
^Use CONFIG_GCC_VERSION, which will always be set by Kconfig. Additionally, Clang 8 had improvements around __builtin_constant_p so use that as a lower limit for this check with Clang (although MIPS wasn't buildable until Clang 9); building a kernel with Clang 9.0.0 has no issues after this change.
--- arch/mips/include/asm/unroll.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/include/asm/unroll.h +2 -1
@@ -25,7 +25,8 @@* generate reasonable code for the switch statement, \ * so we skip the sanity check for those compilers. \ */ \ -BUILD_BUG_ON (GCC_VERSION >=40700 && \ +BUILD_BUG_ON ((CONFIG_GCC_VERSION >=40700 || \ +CONFIG_CLANG_VERSION >=80000 ) && \ !__builtin_constant_p (times)); \ \switch (times) { \
Signature · 1 line
2.23.0
Paul Burton
AppliedHello,
Quoted 24 lines · Nathan Chancellor
Building with Clang errors after commit
6baaeadae911("MIPS: Provideunroll()macro, use it for cache ops") since theGCC_VERSIONmacro is defined ininclude/linux/compiler-gcc.h, which is only included incompiler.hwhen using GCC:In file included from
arch/mips/kernel/mips-mt.c:20:./arch/mips/include/asm/r4kcache.h:254:1: error: use of undeclared identifier 'GCC_VERSION'; did you mean 'S_VERSION'?__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, )
^./arch/mips/include/asm/r4kcache.h:219:4: note: expanded from macro '__BUILD_BLAST_CACHE'
cache_unroll(32,kernel_cache, indexop, ^./arch/mips/include/asm/r4kcache.h:203:2: note: expanded from macro 'cache_unroll'unroll(times, _cache_op, insn, op, (addr) + (i++ * (lsize))); ^ ./arch/mips/include/asm/unroll.h:28:15: note: expanded from macro 'unroll' BUILD_BUG_ON(GCC_VERSION >= 40700 && \ ^
Quoted 5 lines
Use
CONFIG_GCC_VERSION, which will always be set byKconfig. Additionally, Clang 8 had improvements around__builtin_constant_pso use that as a lower limit for this check with Clang (although MIPS wasn't buildable until Clang 9); building a kernel with Clang 9.0.0 has no issues after this change.
Applied to mips-next.
Quoted 7 lines
commit
df3da04880b4
https://git.kernel.org/mips/c/df3da04880b4Fixes 6baaeadae911 ("MIPS: Provide unroll() macro, use it for cache ops")Signed-off-by Nathan Chancellor <[email protected]>Signed-off-by Paul Burton <[email protected]>
Thanks,
Paul
[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]