From 1302f9fec0928a0f3d8c3485901a0a8c99157c24 Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Fri, 13 Sep 2013 17:02:45 +0000 Subject: [PATCH] Fix Neon detection for Cortex-A class, plus adds some more CPUs to default features git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190702 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/Targets.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index b1cbc23f81..b0467b5342 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -3648,10 +3648,12 @@ public: void getDefaultFeatures(llvm::StringMap &Features) const { if (CPU == "arm1136jf-s" || CPU == "arm1176jzf-s" || CPU == "mpcore") Features["vfp2"] = true; - else if (CPU == "cortex-a8" || CPU == "cortex-a15" || - CPU == "cortex-a9" || CPU == "cortex-a9-mp") + else if (CPU == "cortex-a8" || CPU == "cortex-a9" || + CPU == "cortex-a9-mp") { + Features["vfp3"] = true; Features["neon"] = true; - else if (CPU == "swift" || CPU == "cortex-a7") { + } else if (CPU == "swift" || CPU == "cortex-a5" || + CPU == "cortex-a7" || CPU == "cortex-a15") { Features["vfp4"] = true; Features["neon"] = true; } @@ -3702,8 +3704,9 @@ public: .Case("arm", true) .Case("softfloat", SoftFloat) .Case("thumb", IsThumb) - .Case("neon", FPU == NeonFPU && !SoftFloat && - StringRef(getCPUDefineSuffix(CPU)).startswith("7")) + .Case("neon", (FPU & NeonFPU) && !SoftFloat && + (StringRef(getCPUDefineSuffix(CPU)).startswith("7") || + StringRef(getCPUDefineSuffix(CPU)).startswith("8"))) .Default(false); } // FIXME: Should we actually have some table instead of these switches? -- 2.40.0