d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 3718102d4 from llvm git (by Simon Atanasyan):

Browse Source 
[mips] Support `octeon+` CPU in the `.set arch=` directive

  Differential Revision: https://reviews.llvm.org/D69850

This is one of the upstream changes needed for adding support for the
OCTEON+ CPU type, so that we can test Clang builds using the most
commonly available FreeBSD/mips64 reference platform, the Edge Router
Lite.

Requested by:	kevans
MFC after:	1 month
X-MFC-With:	r353358
This commit is contained in:
Dimitry Andric 2019-11-21 20:23:35 +00:00
parent 2967f08a40
commit 5f0c7cb67f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354980
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -7122,8 +7122,8 @@ bool MipsAsmParser::parseSetArchDirective() {
return reportParseError("unexpected token, expected equals sign");
Parser.Lex();
StringRef Arch;
if (Parser.parseIdentifier(Arch))
StringRef Arch = getParser().parseStringToEndOfStatement().trim();
if (Arch.empty())
return reportParseError("expected arch identifier");
StringRef ArchFeatureName =
@ -7144,6 +7144,7 @@ bool MipsAsmParser::parseSetArchDirective() {
.Case("mips64r5", "mips64r5")
.Case("mips64r6", "mips64r6")
.Case("octeon", "cnmips")
.Case("octeon+", "cnmipsp")
.Case("r4000", "mips3") // This is an implementation of Mips3.
.Default("");