summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley Smith <bradley.smith@arm.com>2015-11-16 11:16:36 +0000
committerBradley Smith <bradley.smith@arm.com>2015-11-16 11:16:36 +0000
commitb350196d77b4bda5e5d09e3f3fb752797552dd2e (patch)
tree315b654a7f2e50f8f6d649ae3c1a0c3861d42150
parent4adcb73933cd20268f85717950fe806f8df7ccc6 (diff)
downloadbcm5719-llvm-b350196d77b4bda5e5d09e3f3fb752797552dd2e.tar.gz
bcm5719-llvm-b350196d77b4bda5e5d09e3f3fb752797552dd2e.zip
[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. llvm-svn: 253199
-rw-r--r--clang/lib/Basic/Targets.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index f7288912009..319a8d93116 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -4501,13 +4501,14 @@ public:
const std::vector<std::string> &FeaturesVec) const override {
std::vector<const char*> 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)
OpenPOWER on IntegriCloud