Skip to content

Commit

Permalink
Restore gcc check in mips asm/unroll.h
Browse files Browse the repository at this point in the history
While raising the gcc version requirement to 4.9, the compile-time check
in the unroll macro was accidentally changed from being used on gcc and
clang to being used on clang only.

Restore the gcc check, changing it from "gcc >= 4.7" to "all gcc".

[ We should probably remove this all entirely: if we remove the check
  for CLANG, then the check for GCC can go away. Older versions of clang
  are not really appropriate or supported for kernel builds - Linus ]

Fixes: 6ec4476 ("Raise gcc version requirement to 4.9")
Signed-off-by: Cesar Eduardo Barros <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
cesarb authored and torvalds committed Jul 10, 2020
1 parent 355a358 commit d4e6045
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/mips/include/asm/unroll.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
* generate reasonable code for the switch statement, \
* so we skip the sanity check for those compilers. \
*/ \
BUILD_BUG_ON((CONFIG_CLANG_VERSION >= 80000) && \
BUILD_BUG_ON((CONFIG_CC_IS_GCC || \
CONFIG_CLANG_VERSION >= 80000) && \
!__builtin_constant_p(times)); \
\
switch (times) { \
Expand Down

0 comments on commit d4e6045

Please sign in to comment.