From 054744783153645bab749209464b88a86b8d645b Mon Sep 17 00:00:00 2001
From: Dylan McKay <me@dylanmckay.io>
Date: Fri, 4 Aug 2017 05:48:20 +0000
Subject: [PATCH] [AVR] Update target machine to use new constructor parameters

The required parameters were changed in r309911.

llvm-svn: 310028
---
 llvm/lib/Target/AVR/AVRTargetMachine.cpp | 9 ++++++---
 llvm/lib/Target/AVR/AVRTargetMachine.h   | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/llvm/lib/Target/AVR/AVRTargetMachine.cpp b/llvm/lib/Target/AVR/AVRTargetMachine.cpp
index 5134d9dee9ea..6430e767f3ee 100644
--- a/llvm/lib/Target/AVR/AVRTargetMachine.cpp
+++ b/llvm/lib/Target/AVR/AVRTargetMachine.cpp
@@ -43,11 +43,14 @@ static Reloc::Model getEffectiveRelocModel(Optional<Reloc::Model> RM) {
 AVRTargetMachine::AVRTargetMachine(const Target &T, const Triple &TT,
                                    StringRef CPU, StringRef FS,
                                    const TargetOptions &Options,
-                                   Optional<Reloc::Model> RM, CodeModel::Model CM,
-                                   CodeGenOpt::Level OL)
+                                   Optional<Reloc::Model> RM,
+                                   Optional<CodeModel::Model> CM,
+                                   CodeGenOpt::Level OL,
+                                   bool JIT)
     : LLVMTargetMachine(
           T, AVRDataLayout, TT,
-          getCPU(CPU), FS, Options, getEffectiveRelocModel(RM), CM, OL),
+          getCPU(CPU), FS, Options, getEffectiveRelocModel(RM),
+          CM, OL),
       SubTarget(TT, getCPU(CPU), FS, *this) {
   this->TLOF = make_unique<AVRTargetObjectFile>();
   initAsmInfo();
diff --git a/llvm/lib/Target/AVR/AVRTargetMachine.h b/llvm/lib/Target/AVR/AVRTargetMachine.h
index 795e94e6af03..ffcf4350d45a 100644
--- a/llvm/lib/Target/AVR/AVRTargetMachine.h
+++ b/llvm/lib/Target/AVR/AVRTargetMachine.h
@@ -29,8 +29,10 @@ namespace llvm {
 class AVRTargetMachine : public LLVMTargetMachine {
 public:
   AVRTargetMachine(const Target &T, const Triple &TT, StringRef CPU,
-                   StringRef FS, const TargetOptions &Options, Optional<Reloc::Model> RM,
-                   CodeModel::Model CM, CodeGenOpt::Level OL);
+                   StringRef FS, const TargetOptions &Options,
+                   Optional<Reloc::Model> RM,
+                   Optional<CodeModel::Model> CM,
+                   CodeGenOpt::Level OL, bool JIT);
 
   const AVRSubtarget *getSubtargetImpl() const;
   const AVRSubtarget *getSubtargetImpl(const Function &) const override;