svn commit: r354980 - head/contrib/llvm/lib/Target/Mips/AsmParser

[Dimitry Andric]

Author: dim
Date: Thu Nov 21 20:23:35 2019
New Revision: 354980
URL: https://svnweb.freebsd.org/changeset/base/354980

Log:
  Merge commit 3718102d4 from llvm git (by Simon Atanasyan):
  
    [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

Modified:
  head/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp

Modified: head/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp	Thu Nov 21 20:22:07 2019	(r354979)
+++ head/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp	Thu Nov 21 20:23:35 2019	(r354980)
@@ -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("");