diff options
| author | Matthias Braun <matze@braunis.de> | 2017-10-12 22:57:28 +0000 |
|---|---|---|
| committer | Matthias Braun <matze@braunis.de> | 2017-10-12 22:57:28 +0000 |
| commit | 9385cf15d1c6a8bf617680568487694c8f0cc92a (patch) | |
| tree | c8c70368586e6b4afd9edcc633e6ff7d50f5f979 /lib/Target/AVR | |
| parent | 355469048133e9dee40631c8772ceb61e4496490 (diff) | |
Revert "TargetMachine: Merge TargetMachine and LLVMTargetMachine"
Reverting to investigate layering effects of MCJIT not linking
libCodeGen but using TargetMachine::getNameWithPrefix() breaking the
lldb bots.
This reverts commit r315633.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315637 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/AVR')
| -rw-r--r-- | lib/Target/AVR/AVRTargetMachine.cpp | 5 | ||||
| -rw-r--r-- | lib/Target/AVR/AVRTargetMachine.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/Target/AVR/AVRTargetMachine.cpp b/lib/Target/AVR/AVRTargetMachine.cpp index 1fbabe00606..f9a738b2182 100644 --- a/lib/Target/AVR/AVRTargetMachine.cpp +++ b/lib/Target/AVR/AVRTargetMachine.cpp @@ -52,8 +52,9 @@ AVRTargetMachine::AVRTargetMachine(const Target &T, const Triple &TT, Optional<Reloc::Model> RM, Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT) - : TargetMachine(T, AVRDataLayout, TT, getCPU(CPU), FS, Options, - getEffectiveRelocModel(RM), getEffectiveCodeModel(CM), OL), + : LLVMTargetMachine(T, AVRDataLayout, TT, getCPU(CPU), FS, Options, + getEffectiveRelocModel(RM), getEffectiveCodeModel(CM), + OL), SubTarget(TT, getCPU(CPU), FS, *this) { this->TLOF = make_unique<AVRTargetObjectFile>(); initAsmInfo(); diff --git a/lib/Target/AVR/AVRTargetMachine.h b/lib/Target/AVR/AVRTargetMachine.h index 123ee31fdb9..ffcf4350d45 100644 --- a/lib/Target/AVR/AVRTargetMachine.h +++ b/lib/Target/AVR/AVRTargetMachine.h @@ -26,11 +26,12 @@ namespace llvm { /// A generic AVR implementation. -class AVRTargetMachine : public TargetMachine { +class AVRTargetMachine : public LLVMTargetMachine { public: AVRTargetMachine(const Target &T, const Triple &TT, StringRef CPU, StringRef FS, const TargetOptions &Options, - Optional<Reloc::Model> RM, Optional<CodeModel::Model> CM, + Optional<Reloc::Model> RM, + Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT); const AVRSubtarget *getSubtargetImpl() const; |