1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 271f02d894..761e5f8b67 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -583,6 +583,13 @@ void Clang::AddARMTargetArgs(const ArgList &Args,
     } else
       D.Diag(clang::diag::err_drv_clang_unsupported) << A->getAsString(Args);
   }
+
+  // Setting -msoft-float effectively disables NEON because of the GCC
+  // implementation, although the same isn't true of VFP or VFP3.
+  if (FloatABI == "soft") {
+      CmdArgs.push_back("-target-feature");
+      CmdArgs.push_back("-neon");
+  }
 }
 
 void Clang::AddMIPSTargetArgs(const ArgList &Args,