Skip to content

Commit c994a3e

Browse files
nickdesaulnierstsbogend
authored andcommitted
MIPS: set mips32r5 for virt extensions
Clang's integrated assembler only accepts these instructions when the cpu is set to mips32r5. With this change, we can assemble malta_defconfig with Clang via `make LLVM_IAS=1`. Link: ClangBuiltLinux#763 Reported-by: Dmitry Golovin <dima@golovin.in> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent 6817c94 commit c994a3e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/mips/include/asm/mipsregs.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c)
20772077
({ int __res; \
20782078
__asm__ __volatile__( \
20792079
".set\tpush\n\t" \
2080-
".set\tmips32r2\n\t" \
2080+
".set\tmips32r5\n\t" \
20812081
_ASM_SET_VIRT \
20822082
"mfgc0\t%0, " #source ", %1\n\t" \
20832083
".set\tpop" \
@@ -2090,7 +2090,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c)
20902090
({ unsigned long long __res; \
20912091
__asm__ __volatile__( \
20922092
".set\tpush\n\t" \
2093-
".set\tmips64r2\n\t" \
2093+
".set\tmips64r5\n\t" \
20942094
_ASM_SET_VIRT \
20952095
"dmfgc0\t%0, " #source ", %1\n\t" \
20962096
".set\tpop" \
@@ -2103,7 +2103,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c)
21032103
do { \
21042104
__asm__ __volatile__( \
21052105
".set\tpush\n\t" \
2106-
".set\tmips32r2\n\t" \
2106+
".set\tmips32r5\n\t" \
21072107
_ASM_SET_VIRT \
21082108
"mtgc0\t%z0, " #register ", %1\n\t" \
21092109
".set\tpop" \
@@ -2115,7 +2115,7 @@ do { \
21152115
do { \
21162116
__asm__ __volatile__( \
21172117
".set\tpush\n\t" \
2118-
".set\tmips64r2\n\t" \
2118+
".set\tmips64r5\n\t" \
21192119
_ASM_SET_VIRT \
21202120
"dmtgc0\t%z0, " #register ", %1\n\t" \
21212121
".set\tpop" \

0 commit comments

Comments
 (0)