From f1f1c010e4c240b0bd47ed9ec162eff6801d65f9 Mon Sep 17 00:00:00 2001 From: Dylan McKay Date: Wed, 18 May 2016 11:11:38 +0000 Subject: [PATCH] [AVR] Fix a few compile errors llvm-svn: 269900 --- llvm/lib/Target/AVR/AVRFrameLowering.h | 2 +- llvm/lib/Target/AVR/AVRInstrInfo.cpp | 1 - llvm/lib/Target/AVR/AVRTargetMachine.cpp | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/AVR/AVRFrameLowering.h b/llvm/lib/Target/AVR/AVRFrameLowering.h index 4b91cfd4c3f1..cd8fe91e1933 100644 --- a/llvm/lib/Target/AVR/AVRFrameLowering.h +++ b/llvm/lib/Target/AVR/AVRFrameLowering.h @@ -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; }; diff --git a/llvm/lib/Target/AVR/AVRInstrInfo.cpp b/llvm/lib/Target/AVR/AVRInstrInfo.cpp index 0ab54a8d56d1..6271b8f82f00 100644 --- a/llvm/lib/Target/AVR/AVRInstrInfo.cpp +++ b/llvm/lib/Target/AVR/AVRInstrInfo.cpp @@ -105,7 +105,6 @@ void AVRInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB, const TargetRegisterClass *RC, const TargetRegisterInfo *TRI) const { MachineFunction &MF = *MBB.getParent(); - AVRMachineFunctionInfo *AFI = MF.getInfo(); DebugLoc DL; if (MI != MBB.end()) { diff --git a/llvm/lib/Target/AVR/AVRTargetMachine.cpp b/llvm/lib/Target/AVR/AVRTargetMachine.cpp index 6e4fdfee388a..125cfb468fbb 100644 --- a/llvm/lib/Target/AVR/AVRTargetMachine.cpp +++ b/llvm/lib/Target/AVR/AVRTargetMachine.cpp @@ -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 Target &T, const Triple &TT, 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(); initAsmInfo(); }