diff options
Diffstat (limited to 'arch/mips/include/asm/compiler.h')
| -rw-r--r-- | arch/mips/include/asm/compiler.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/arch/mips/include/asm/compiler.h b/arch/mips/include/asm/compiler.h index 9196fca4335d..f77e99f1722e 100644 --- a/arch/mips/include/asm/compiler.h +++ b/arch/mips/include/asm/compiler.h | |||
| @@ -43,18 +43,14 @@ | |||
| 43 | #undef barrier_before_unreachable | 43 | #undef barrier_before_unreachable |
| 44 | #define barrier_before_unreachable() asm volatile(".insn") | 44 | #define barrier_before_unreachable() asm volatile(".insn") |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_CPU_MIPSR6 | 46 | #if !defined(CONFIG_CC_IS_GCC) || \ |
| 47 | /* All MIPS R6 toolchains support the ZC constrain */ | 47 | (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) |
| 48 | #define GCC_OFF_SMALL_ASM() "ZC" | 48 | # define GCC_OFF_SMALL_ASM() "ZC" |
| 49 | #else | 49 | #elif defined(CONFIG_CPU_MICROMIPS) |
| 50 | #ifndef CONFIG_CPU_MICROMIPS | 50 | # error "microMIPS compilation unsupported with GCC older than 4.9" |
| 51 | #define GCC_OFF_SMALL_ASM() "R" | ||
| 52 | #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) | ||
| 53 | #define GCC_OFF_SMALL_ASM() "ZC" | ||
| 54 | #else | 51 | #else |
| 55 | #error "microMIPS compilation unsupported with GCC older than 4.9" | 52 | # define GCC_OFF_SMALL_ASM() "R" |
| 56 | #endif /* CONFIG_CPU_MICROMIPS */ | 53 | #endif |
| 57 | #endif /* CONFIG_CPU_MIPSR6 */ | ||
| 58 | 54 | ||
| 59 | #ifdef CONFIG_CPU_MIPSR6 | 55 | #ifdef CONFIG_CPU_MIPSR6 |
| 60 | #define MIPS_ISA_LEVEL "mips64r6" | 56 | #define MIPS_ISA_LEVEL "mips64r6" |