svn commit: r354981 - head/contrib/llvm/lib/Target/Mips/MCTargetDesc

[Dimitry Andric]

Author: dim
Date: Thu Nov 21 20:25:12 2019
New Revision: 354981
URL: https://svnweb.freebsd.org/changeset/base/354981

Log:
  Merge commit bf996f761 from llvm git (by Simon Atanasyan):
  
    [mips] Write `AFL_EXT_OCTEONP` flag to the `.MIPS.abiflags` section
  
    Differential Revision: https://reviews.llvm.org/D69851
  
  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/MCTargetDesc/MipsABIFlagsSection.h

Modified: head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h
==============================================================================
--- head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h	Thu Nov 21 20:23:35 2019	(r354980)
+++ head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h	Thu Nov 21 20:25:12 2019	(r354981)
@@ -139,7 +139,9 @@ struct MipsABIFlagsSection { (public)
 
   template <class PredicateLibrary>
   void setISAExtensionFromPredicates(const PredicateLibrary &P) {
-    if (P.hasCnMips())
+    if (P.hasCnMipsP())
+      ISAExtension = Mips::AFL_EXT_OCTEONP;
+    else if (P.hasCnMips())
       ISAExtension = Mips::AFL_EXT_OCTEON;
     else
       ISAExtension = Mips::AFL_EXT_NONE;