Re: [PATCH] mips: Fix unroll macro when building with Clang
From: Paul Burton
Date: Thu Oct 10 2019 - 17:04:37 EST
Nathan Chancellor wrote:
> 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
> cache_unroll(32, kernel_cache, indexop,
> ./arch/mips/include/asm/r4kcache.h:203:2: note: expanded from macro
> unroll(times, _cache_op, insn, op, (addr) + (i++ * (lsize)));
> ./arch/mips/include/asm/unroll.h:28:15: note: expanded from macro
> 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.
Applied to mips-next.
> commit df3da04880b4
> Fixes: 6baaeadae911 ("MIPS: Provide unroll() macro, use it for cache ops")
> Link: https://github.com/ClangBuiltLinux/linux/issues/736
> Signed-off-by: Nathan Chancellor <natechancellor@xxxxxxxxx>
> Signed-off-by: Paul Burton <paul.burton@xxxxxxxx>
[ This message was auto-generated; if you believe anything is incorrect
then please email paul.burton@xxxxxxxx to report it. ]