From 63d64da0cefa3b518914380e9ee5565666b8c972 Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Thu, 6 Aug 2015 15:44:12 +0000 Subject: [PATCH] [SPARC] Don't compare arch name as a string, use the enum instead. Fixes PR22695 llvm-svn: 244221 --- llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp | 2 +- llvm/test/MC/Sparc/sparc-directive-xword.s | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp b/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp index fc56bf9..bba5c5e 100644 --- a/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp +++ b/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp @@ -77,7 +77,7 @@ class SparcAsmParser : public MCTargetAsmParser { 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, diff --git a/llvm/test/MC/Sparc/sparc-directive-xword.s b/llvm/test/MC/Sparc/sparc-directive-xword.s index 0c9e249..736f99f 100644 --- a/llvm/test/MC/Sparc/sparc-directive-xword.s +++ b/llvm/test/MC/Sparc/sparc-directive-xword.s @@ -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 -- 2.7.4