diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2012-02-03 06:27:22 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2012-02-03 06:27:22 +0000 |
| commit | 71fd6cc843719cab528a5df0899ad3d15cb9297f (patch) | |
| tree | b99c1709e9fcc3c56d6f049f3aced058cbbecd3a /lib/CodeGen/BackendUtil.cpp | |
| parent | a83f4d2315dbeb3914868f1ccb8e74fb2ccdbb0c (diff) | |
Fix -ftrap-function fallout from llvm r145714. <rdar://problem/10799325>
That llvm change removed the -trap-func backend option, so that using
-ftrap-function with clang would cause the backend to complain. Fix it
by adding the trap function name to the CodeGenOptions and passing it through
to the TargetOptions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149679 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/BackendUtil.cpp')
| -rw-r--r-- | lib/CodeGen/BackendUtil.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp index c1636952da..1cbc69b03b 100644 --- a/lib/CodeGen/BackendUtil.cpp +++ b/lib/CodeGen/BackendUtil.cpp @@ -327,6 +327,7 @@ bool EmitAssemblyHelper::AddEmitPasses(BackendAction Action, Options.StackAlignmentOverride = CodeGenOpts.StackAlignment; Options.RealignStack = CodeGenOpts.StackRealignment; Options.DisableTailCalls = CodeGenOpts.DisableTailCalls; + Options.TrapFuncName = CodeGenOpts.TrapFuncName; TargetMachine *TM = TheTarget->createTargetMachine(Triple, TargetOpts.CPU, FeaturesStr, Options, |