From 2bc1b74cfecb4aea98981935506448f13dec642f Mon Sep 17 00:00:00 2001 From: John Leidel Date: Tue, 26 May 2015 20:32:32 -0500 Subject: removing code that manually enables/disables frame pointer support as this is deprecated in LLVM trunk from r238244 on --- lib/CodeGen/BackendUtil.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp index db8c12befa..4dc6153f3d 100644 --- a/lib/CodeGen/BackendUtil.cpp +++ b/lib/CodeGen/BackendUtil.cpp @@ -320,6 +320,12 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) { llvm::TargetOptions Options; // Set frame pointer elimination mode. + // WARNING: This code is now dead for LLVM trunk checkin r238244 + // The checkin in question removes the global variable NoFramePointerElim + // from TargetOptions in favor of using resetTargetOptions. This function + // resides in TargetMachine and called for individual function instances + // via the DAG selection. +#if 0 if (!CodeGenOpts.DisableFPElim) { Options.NoFramePointerElim = false; //Options.NoFramePointerElimNonLeaf = false; @@ -330,6 +336,7 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) { Options.NoFramePointerElim = true; //Options.NoFramePointerElimNonLeaf = true; } +#endif if (CodeGenOpts.UseInitArray) Options.UseInitArray = true; -- cgit v1.2.1