Skip to content

Commit 9321f1a

Browse files
nathanchancetorvalds
authored andcommitted
mips: Remove compiler check in unroll macro
CONFIG_CC_IS_GCC is undefined when Clang is used, which breaks the build (see our Travis link below). Clang 8 was chosen as a minimum version for this check because there were some improvements around __builtin_constant_p in that release. In reality, MIPS was not even buildable until clang 9 so that check was not technically necessary. Just remove all compiler checks and just assume that we have a working compiler. Fixes: d4e6045 ("Restore gcc check in mips asm/unroll.h") Link: https://travis-ci.com/github/ClangBuiltLinux/continuous-integration/jobs/359642821 Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent aa0c908 commit 9321f1a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/mips/include/asm/unroll.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
* generate reasonable code for the switch statement, \
2626
* so we skip the sanity check for those compilers. \
2727
*/ \
28-
BUILD_BUG_ON((CONFIG_CC_IS_GCC || \
29-
CONFIG_CLANG_VERSION >= 80000) && \
30-
!__builtin_constant_p(times)); \
28+
BUILD_BUG_ON(!__builtin_constant_p(times)); \
3129
\
3230
switch (times) { \
3331
case 32: fn(__VA_ARGS__); /* fall through */ \

0 commit comments

Comments
 (0)