[llvm] r269900 - [AVR] Fix a few compile errors

[Dylan McKay via llvm-commits]

Author: dylanmckay
Date: Wed May 18 06:11:38 2016
New Revision: 269900

URL: http://llvm.org/viewvc/llvm-project?rev=269900&view=rev
Log:
[AVR] Fix a few compile errors

Modified:
    llvm/trunk/lib/Target/AVR/AVRFrameLowering.h
    llvm/trunk/lib/Target/AVR/AVRInstrInfo.cpp
    llvm/trunk/lib/Target/AVR/AVRTargetMachine.cpp

Modified: llvm/trunk/lib/Target/AVR/AVRFrameLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/AVRFrameLowering.h?rev=269900&r1=269899&r2=269900&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/AVRFrameLowering.h (original)
+++ llvm/trunk/lib/Target/AVR/AVRFrameLowering.h Wed May 18 06:11:38 2016
@@ -38,7 +38,7 @@ public:
   bool canSimplifyCallFramePseudos(const MachineFunction &MF) const override;
   void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs,
                             RegScavenger *RS = nullptr) const override;
-  void
+  MachineBasicBlock::iterator
   eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB,
                                 MachineBasicBlock::iterator MI) const override;
 };

Modified: llvm/trunk/lib/Target/AVR/AVRInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/AVRInstrInfo.cpp?rev=269900&r1=269899&r2=269900&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/AVRInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/AVR/AVRInstrInfo.cpp Wed May 18 06:11:38 2016
@@ -105,7 +105,6 @@ void AVRInstrInfo::storeRegToStackSlot(M
                                        const TargetRegisterClass *RC,
                                        const TargetRegisterInfo *TRI) const {
   MachineFunction &MF = *MBB.getParent();
-  AVRMachineFunctionInfo *AFI = MF.getInfo<AVRMachineFunctionInfo>();
 
   DebugLoc DL;
   if (MI != MBB.end()) {

Modified: llvm/trunk/lib/Target/AVR/AVRTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/AVRTargetMachine.cpp?rev=269900&r1=269899&r2=269900&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/AVRTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/AVR/AVRTargetMachine.cpp Wed May 18 06:11:38 2016
@@ -26,7 +26,7 @@
 namespace llvm {
 
 /// Processes a CPU name.
-static StringRef getTargetCPU(StringRef CPU) {
+static StringRef getCPU(StringRef CPU) {
   if (CPU.empty() || CPU == "generic") {
     return "avr2";
   }
@@ -41,8 +41,8 @@ AVRTargetMachine::AVRTargetMachine(const
                                    CodeGenOpt::Level OL)
     : LLVMTargetMachine(
           T, "e-p:16:8:8-i8:8:8-i16:8:8-i32:8:8-i64:8:8-f32:8:8-f64:8:8-n8", TT,
-          getTargetCPU(CPU), FS, Options, RM, CM, OL),
-      SubTarget(TT, GetTargetCPU(CPU), FS, *this) {
+          getCPU(CPU), FS, Options, RM, CM, OL),
+      SubTarget(TT, getCPU(CPU), FS, *this) {
   this->TLOF = make_unique<AVRTargetObjectFile>();
   initAsmInfo();
 }