summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp2
-rw-r--r--llvm/test/MC/Mips/set-arch.s6
2 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
index 011727a88c8..c1df2d58cd4 100644
--- a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -5350,7 +5350,7 @@ bool MipsAsmParser::parseSetArchDirective() {
.Case("mips64r3", "mips64r3")
.Case("mips64r5", "mips64r5")
.Case("mips64r6", "mips64r6")
- .Case("cnmips", "cnmips")
+ .Case("octeon", "cnmips")
.Case("r4000", "mips3") // This is an implementation of Mips3.
.Default("");
diff --git a/llvm/test/MC/Mips/set-arch.s b/llvm/test/MC/Mips/set-arch.s
index 834718c5d55..e1123a90d06 100644
--- a/llvm/test/MC/Mips/set-arch.s
+++ b/llvm/test/MC/Mips/set-arch.s
@@ -36,7 +36,8 @@
drotr32 $1, $14, 15
.set arch=mips64r6
mod $2, $4, $6
- .set arch=cnmips
+ .set arch=octeon
+ baddu $9, $6, $7
.set arch=r4000
dadd $2, $2, $2
@@ -62,6 +63,7 @@
# CHECK: drotr32 $1, $14, 15
# CHECK: .set arch=mips64r6
# CHECK: mod $2, $4, $6
-# CHECK: .set arch=cnmips
+# CHECK: .set arch=octeon
+# CHECK: baddu $9, $6, $7
# CHECK: .set arch=r4000
# CHECK: dadd $2, $2, $2
OpenPOWER on IntegriCloud