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 | 14adb360a7015dae78c80cd830f6adfe5e1bcabc (patch) | |
tree | 3f7383a3be54f486feac4746fafd092c2a7c6538 /clang/lib/CodeGen/BackendUtil.cpp | |
parent | 3b1817d2f5b73a8b23a61e62825e9f0c73604dd4 (diff) | |
download | bcm5719-llvm-14adb360a7015dae78c80cd830f6adfe5e1bcabc.tar.gz bcm5719-llvm-14adb360a7015dae78c80cd830f6adfe5e1bcabc.zip |
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.
llvm-svn: 149679
Diffstat (limited to 'clang/lib/CodeGen/BackendUtil.cpp')
-rw-r--r-- | clang/lib/CodeGen/BackendUtil.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index c1636952da1..1cbc69b03b6 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/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, |