summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjleidel <john.leidel@ttu.edu>2015-07-31 21:32:03 -0500
committerCraig Griffiths <craig.griffiths@codethink.co.uk>2015-08-14 10:49:30 +0100
commita2084c538916376a366b703f0da9ec623f720775 (patch)
treedbe1f17ba0c67ff74045c970645ee733f9317305
parentf5efb3c8e9c66f48cd2568924da3d44f6547ae1c (diff)
downloadflang-a2084c538916376a366b703f0da9ec623f720775.tar.gz
merging up to LLVM_TRUNK 07/31/15
-rw-r--r--lib/CodeGen/BackendUtil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp
index 4dc6153f3d..88d0c8e5a4 100644
--- a/lib/CodeGen/BackendUtil.cpp
+++ b/lib/CodeGen/BackendUtil.cpp
@@ -374,8 +374,8 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) {
//Options.UseSoftFloat = CodeGenOpts.SoftFloat;
Options.StackAlignmentOverride = CodeGenOpts.StackAlignment;
//Options.RealignStack = CodeGenOpts.StackRealignment;
- Options.DisableTailCalls = CodeGenOpts.DisableTailCalls;
- Options.TrapFuncName = CodeGenOpts.TrapFuncName;
+ //Options.DisableTailCalls = CodeGenOpts.DisableTailCalls;
+ //Options.TrapFuncName = CodeGenOpts.TrapFuncName;
//Options.PositionIndependentExecutable = LangOpts.PIELevel != 0;
//Options.EnableSegmentedStacks = CodeGenOpts.EnableSegmentedStacks;