aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/TargetMachine.cpp5
-rw-r--r--lib/Target/X86/X86RegisterInfo.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index f5bbdd15d5..8ed0639a96 100644
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -23,7 +23,7 @@ using namespace llvm;
namespace llvm {
bool PrintMachineCode;
- bool NoFPElim;
+ bool NoFramePointerElim;
};
namespace {
@@ -34,7 +34,8 @@ namespace {
cl::opt<bool, true>
DisableFPElim("disable-fp-elim",
cl::desc("Disable frame pointer elimination optimization"),
- cl::location(NoFPElim), cl::init(false));
+ cl::location(NoFramePointerElim),
+ cl::init(false));
};
//---------------------------------------------------------------------------
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 150ed749a1..8be00312c0 100644
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -333,7 +333,7 @@ MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr* MI,
// if frame pointer elimination is disabled.
//
static bool hasFP(MachineFunction &MF) {
- return NoFPElim || MF.getFrameInfo()->hasVarSizedObjects();
+ return NoFramePointerElim || MF.getFrameInfo()->hasVarSizedObjects();
}
void X86RegisterInfo::