commit 5b8461d4b4f3fab22498bc2334e59c24ae39e8dd
author Stephen Hines <srhines@google.com> Wed May 07 00:26:36 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 07 00:26:36 2014 +0000
tree d2f46f9308403ce448887f8b1abfacb9759b9043
parent b0f08d0b260f10150c7dce1401712f6fbdb34324
parent c37e97ebd687460a3b263a59cbb26bc539ad856e

Merge "Use ARCH_ARM_HAVE_NEON define instead of cpuinfo to detect NEON support."

lib/Support/TargetCompilerConfigs.cpp

diff --git a/lib/Support/TargetCompilerConfigs.cpp b/lib/Support/TargetCompilerConfigs.cpp
index 948e836..102b031 100644
--- a/lib/Support/TargetCompilerConfigs.cpp
+++ b/lib/Support/TargetCompilerConfigs.cpp
@@ -67,12 +67,16 @@
     }
   }
 
-  if (pEnableNEON && Features.count("neon") && Features["neon"]) {
+#if defined(ARCH_ARM_HAVE_NEON)
+  if (pEnableNEON) {
     pAttributes.push_back("+neon");
   } else {
+#endif
     pAttributes.push_back("-neon");
     pAttributes.push_back("-neonfp");
+#if defined(ARCH_ARM_HAVE_NEON)
   }
+#endif
 
   if (!getProperty("debug.rs.arm-no-hwdiv")) {
     if (Features.count("hwdiv-arm") && Features["hwdiv-arm"])