From a1a3a6d36e9ec5151a872ae33a24a5f471efa258 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 21 Nov 2019 20:25:12 +0000 Subject: [PATCH] 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 --- .../llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h b/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h index 239e55495e9d..6091ee24b04d 100644 --- a/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h +++ b/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsABIFlagsSection.h @@ -139,7 +139,9 @@ struct MipsABIFlagsSection { template 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;