Index: lib/Target/Mips/AsmParser/MipsAsmParser.cpp
===================================================================
--- lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -5296,6 +5296,7 @@
           .Case("mips64r5", "mips64r5")
           .Case("mips64r6", "mips64r6")
           .Case("cnmips", "cnmips")
+          .Case("octeon", "cnmips")
           .Case("r4000", "mips3") // This is an implementation of Mips3.
           .Default("");
 
Index: test/MC/Mips/set-arch.s
===================================================================
--- test/MC/Mips/set-arch.s
+++ test/MC/Mips/set-arch.s
@@ -37,6 +37,7 @@
     .set arch=mips64r6
     mod         $2, $4, $6
     .set arch=cnmips
+    .set arch=octeon
     .set arch=r4000
     dadd        $2, $2, $2
 
@@ -63,5 +64,6 @@
 # CHECK: .set arch=mips64r6
 # CHECK: mod         $2, $4, $6
 # CHECK: .set arch=cnmips
+# CHECK: .set arch=octeon
 # CHECK: .set arch=r4000
 # CHECK: dadd        $2, $2, $2