Spell out `NoFramePointerElim' for readability.

llvm-svn: 14299

3 files changed, 5 insertions, 4 deletions

diff --git a/llvm/include/llvm/Target/TargetMachineImpls.h b/llvm/include/llvm/Target/TargetMachineImpls.h
index 92f799278a3..e70c9b72fe1 100644
--- a/llvm/include/llvm/Target/TargetMachineImpls.h
+++ b/llvm/include/llvm/Target/TargetMachineImpls.h
@@ -20,7 +20,7 @@ namespace llvm {
   /// these should go in their own header eventually.
   ///
   extern bool PrintMachineCode;
-  extern bool NoFPElim;
+  extern bool NoFramePointerElim;
 
   class TargetMachine;
   class Module;
diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp
index f5bbdd15d5e..8ed0639a96a 100644
--- a/llvm/lib/Target/TargetMachine.cpp
+++ b/llvm/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/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp
index 150ed749a1b..8be00312c0a 100644
--- a/llvm/lib/Target/X86/X86RegisterInfo.cpp
+++ b/llvm/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::