[llvm] r266081 - [mips] add assembler support for .set arch=octeon

[Petar Jovanovic via llvm-commits]

Author: petarj
Date: Tue Apr 12 10:28:16 2016
New Revision: 266081

URL: http://llvm.org/viewvc/llvm-project?rev=266081&view=rev
Log:
[mips] add assembler support for .set arch=octeon

This patch enables assembler support for .set arch=octeon.
It will fix issues with inline assembler when this directive is used.

Patch by Strahinja Petrovic.

Differential Revision: http://reviews.llvm.org/D18548

Modified:
    llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
    llvm/trunk/test/MC/Mips/set-arch.s

Modified: llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp?rev=266081&r1=266080&r2=266081&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp Tue Apr 12 10:28:16 2016
@@ -5350,7 +5350,7 @@ bool MipsAsmParser::parseSetArchDirectiv
           .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("");
 

Modified: llvm/trunk/test/MC/Mips/set-arch.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/set-arch.s?rev=266081&r1=266080&r2=266081&view=diff
==============================================================================
--- llvm/trunk/test/MC/Mips/set-arch.s (original)
+++ llvm/trunk/test/MC/Mips/set-arch.s Tue Apr 12 10:28:16 2016
@@ -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