[llvm-branch-commits] [llvm-branch] r252393 - Merging r244221:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri Nov  6 20:40:48 2015
New Revision: 252393

URL: http://llvm.org/viewvc/llvm-project?rev=252393&view=rev
Log:
Merging r244221:

------------------------------------------------------------------------
r244221 | dougk | 2015-08-06 11:44:12 -0400 (Thu, 06 Aug 2015) | 4 lines

[SPARC] Don't compare arch name as a string, use the enum instead.

Fixes PR22695

------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
    llvm/branches/release_37/test/MC/Sparc/sparc-directive-xword.s

Modified: llvm/branches/release_37/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp?rev=252393&r1=252392&r2=252393&view=diff
==============================================================================
--- llvm/branches/release_37/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (original)
+++ llvm/branches/release_37/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp Fri Nov  6 20:40:48 2015
@@ -77,7 +77,7 @@ class SparcAsmParser : public MCTargetAs
   bool parseDirectiveWord(unsigned Size, SMLoc L);
 
   bool is64Bit() const {
-    return STI.getTargetTriple().getArchName().startswith("sparcv9");
+    return STI.getTargetTriple().getArch() == Triple::sparcv9;
   }
 
   void expandSET(MCInst &Inst, SMLoc IDLoc,

Modified: llvm/branches/release_37/test/MC/Sparc/sparc-directive-xword.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/test/MC/Sparc/sparc-directive-xword.s?rev=252393&r1=252392&r2=252393&view=diff
==============================================================================
--- llvm/branches/release_37/test/MC/Sparc/sparc-directive-xword.s (original)
+++ llvm/branches/release_37/test/MC/Sparc/sparc-directive-xword.s Fri Nov  6 20:40:48 2015
@@ -1,5 +1,6 @@
 ! RUN: not llvm-mc %s -arch=sparc   -show-encoding 2>&1 | FileCheck %s --check-prefix=SPARC32
-! RUN: llvm-mc %s -arch=sparcv9 -show-encoding | FileCheck %s --check-prefix=SPARC64
+! RUN: llvm-mc %s -triple sparc64 -show-encoding | FileCheck %s --check-prefix=SPARC64
+! RUN: llvm-mc %s -triple sparcv9 -show-encoding | FileCheck %s --check-prefix=SPARCV9
 
         ! SPARC32:       error: unknown directive
         ! SPARC32-NEXT:  .xword 65536
@@ -8,3 +9,5 @@
         ! SPARC64:  .xword 65536
         .xword 65536
 
+        ! SPARCV9:  .xword 65536
+        .xword 65536