diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 9e0eab3..29f8f83 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -605,6 +605,17 @@
     CmdArgs.push_back("-neon");
   }
 
+  // Forward -mtrap_function= options to the backend.
+  for (arg_iterator it = Args.filtered_begin(options::OPT_mtrap_function_EQ),
+         ie = Args.filtered_end(); it != ie; ++it) {
+    const Arg *A = *it;
+    A->claim();
+    assert(A->getNumValues() == 1 && "-mtrap_function= expects one argument.");
+    llvm::StringRef FuncName = A->getValue(Args, 0);
+    CmdArgs.push_back("-backend-option");
+    CmdArgs.push_back(Args.MakeArgString("-arm-trap-func=" + FuncName));
+  }
+
   // Kernel code has more strict alignment requirements.
   if (KernelOrKext) {
     CmdArgs.push_back("-backend-option");