Index: lib/Driver/ToolChains/Clang.cpp
===================================================================
--- lib/Driver/ToolChains/Clang.cpp
+++ lib/Driver/ToolChains/Clang.cpp
@@ -469,6 +469,11 @@
 
   if (EH)
     CmdArgs.push_back("-fexceptions");
+  else if (Triple.getArch() == llvm::Triple::arm &&
+	   !Triple.isOSDarwin() && !Triple.isOSWindows()) {
+    CmdArgs.push_back("-mllvm");
+    CmdArgs.push_back("-disable-arm-cantunwind");
+  }
 }
 
 static bool ShouldDisableAutolink(const ArgList &Args, const ToolChain &TC) {