From 09adec2e3ceb8b9a953d543ae049870e6570b579 Mon Sep 17 00:00:00 2001 From: Bradley Smith Date: Mon, 16 Nov 2015 11:16:36 +0000 Subject: [PATCH] [ARM] Pass in the architecture to TargetParser to cope with API change The TargetParser API to get the default FPU and default extensions has changed so that it can fall back to the architecture in case of a generic CPU. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253199 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/Targets.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index f728891200..319a8d9311 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -4501,13 +4501,14 @@ public: const std::vector &FeaturesVec) const override { std::vector TargetFeatures; + unsigned Arch = llvm::ARM::parseArch(getTriple().getArchName()); // get default FPU features - unsigned FPUKind = llvm::ARM::getDefaultFPU(CPU); + unsigned FPUKind = llvm::ARM::getDefaultFPU(CPU, Arch); llvm::ARM::getFPUFeatures(FPUKind, TargetFeatures); // get default Extension features - unsigned Extensions = llvm::ARM::getDefaultExtensions(CPU); + unsigned Extensions = llvm::ARM::getDefaultExtensions(CPU, Arch); llvm::ARM::getExtensionFeatures(Extensions, TargetFeatures); for (const char *Feature : TargetFeatures) -- 2.50.1