diff options
author | Matthias Braun <matze@braunis.de> | 2017-10-12 22:28:54 +0000 |
---|---|---|
committer | Matthias Braun <matze@braunis.de> | 2017-10-12 22:28:54 +0000 |
commit | 3d239d68e581a041b90dff08ad6ab25f05098db7 (patch) | |
tree | e44eea240d712ca51b0cb0f41adff38eac757b42 /llvm/lib/Target/Lanai | |
parent | eb96a02077b4f2719f2003dc816419dd73fd9599 (diff) |
TargetMachine: Merge TargetMachine and LLVMTargetMachine
Merge LLVMTargetMachine into TargetMachine.
- There is no in-tree target anymore that just implements TargetMachine
but not LLVMTargetMachine.
- It should still be possible to stub out all the various functions in
case a target does not want to use lib/CodeGen
- This simplifies the code and avoids methods ending up in the wrong
interface.
Differential Revision: https://reviews.llvm.org/D38489
Diffstat (limited to 'llvm/lib/Target/Lanai')
-rw-r--r-- | llvm/lib/Target/Lanai/LanaiTargetMachine.cpp | 6 | ||||
-rw-r--r-- | llvm/lib/Target/Lanai/LanaiTargetMachine.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp b/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp index 9a73c95d651..ec358e9495e 100644 --- a/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp +++ b/llvm/lib/Target/Lanai/LanaiTargetMachine.cpp @@ -65,9 +65,9 @@ LanaiTargetMachine::LanaiTargetMachine(const Target &T, const Triple &TT, Optional<Reloc::Model> RM, Optional<CodeModel::Model> CodeModel, CodeGenOpt::Level OptLevel, bool JIT) - : LLVMTargetMachine(T, computeDataLayout(), TT, Cpu, FeatureString, Options, - getEffectiveRelocModel(RM), - getEffectiveCodeModel(CodeModel), OptLevel), + : TargetMachine(T, computeDataLayout(), TT, Cpu, FeatureString, Options, + getEffectiveRelocModel(RM), + getEffectiveCodeModel(CodeModel), OptLevel), Subtarget(TT, Cpu, FeatureString, *this, Options, getCodeModel(), OptLevel), TLOF(new LanaiTargetObjectFile()) { diff --git a/llvm/lib/Target/Lanai/LanaiTargetMachine.h b/llvm/lib/Target/Lanai/LanaiTargetMachine.h index ce1271d9dea..5f12bd3c827 100644 --- a/llvm/lib/Target/Lanai/LanaiTargetMachine.h +++ b/llvm/lib/Target/Lanai/LanaiTargetMachine.h @@ -25,7 +25,7 @@ namespace llvm { class formatted_raw_ostream; -class LanaiTargetMachine : public LLVMTargetMachine { +class LanaiTargetMachine : public TargetMachine { LanaiSubtarget Subtarget; std::unique_ptr<TargetLoweringObjectFile> TLOF; |