Rename -mtrap_function= to -ftrap_function= since it's now a target neutral options.
llvm-svn: 129153
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 29f8f83..fa78967 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -605,17 +605,6 @@
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");
@@ -1462,6 +1451,13 @@
CmdArgs.push_back(A->getValue(Args));
}
+ // Forward -ftrap_function= options to the backend.
+ if (Arg *A = Args.getLastArg(options::OPT_ftrap_function_EQ)) {
+ llvm::StringRef FuncName = A->getValue(Args);
+ CmdArgs.push_back("-backend-option");
+ CmdArgs.push_back(Args.MakeArgString("-trap-func=" + FuncName));
+ }
+
// -fno-strict-overflow implies -fwrapv if it isn't disabled, but
// -fstrict-overflow won't turn off an explicitly enabled -fwrapv.
if (Arg *A = Args.getLastArg(options::OPT_fwrapv,