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

[Hans Wennborg via llvm-commits]

+Tom for 3.7.1

On Wed, Aug 26, 2015 at 4:21 PM, Hans Wennborg <hans at chromium.org> wrote:
> It's too late in the 3.7.0 process for me to be comfortable merging
> this now. I'm keeping it on my list for 3.7.1.
>
> Thanks,
> Hans
>
> On Mon, Aug 24, 2015 at 3:16 PM, Venkatraman Govindaraju
> <venkatra at cs.wisc.edu> wrote:
>> LGTM.
>>
>> Please merge to 3.7 if it is not too late.
>>
>> Thanks,
>> Venkat
>>
>> On Tue, Aug 18, 2015 at 2:50 PM, Hans Wennborg via llvm-commits
>> <llvm-commits at lists.llvm.org> wrote:
>>> Joerg suggested we merge this to 3.7.
>>>
>>> Venkatraman, you're the code owner here. OK for merging to 3.7?
>>>
>>> Thanks,
>>> Hans
>>>
>>> On Thu, Aug 6, 2015 at 8:44 AM, Douglas Katzman via llvm-commits
>>> <llvm-commits at lists.llvm.org> wrote:
>>>> Author: dougk
>>>> Date: Thu Aug  6 10:44:12 2015
>>>> New Revision: 244221
>>>>
>>>> URL: http://llvm.org/viewvc/llvm-project?rev=244221&view=rev
>>>> Log:
>>>> [SPARC] Don't compare arch name as a string, use the enum instead.
>>>>
>>>> Fixes PR22695
>>>>
>>>> Modified:
>>>>     llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
>>>>     llvm/trunk/test/MC/Sparc/sparc-directive-xword.s
>>>>
>>>> Modified: llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp
>>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp?rev=244221&r1=244220&r2=244221&view=diff
>>>> ==============================================================================
>>>> --- llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (original)
>>>> +++ llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp Thu Aug  6 10:44:12 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/trunk/test/MC/Sparc/sparc-directive-xword.s
>>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Sparc/sparc-directive-xword.s?rev=244221&r1=244220&r2=244221&view=diff
>>>> ==============================================================================
>>>> --- llvm/trunk/test/MC/Sparc/sparc-directive-xword.s (original)
>>>> +++ llvm/trunk/test/MC/Sparc/sparc-directive-xword.s Thu Aug  6 10:44:12 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