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 | a063107f8d12831004583ab9c1fd70f84806a563 (patch) | |
tree | 0cd8201b19e2d5322836d4c6d396da3542d99ce1 /lib/Target/MSP430 | |
parent | 8520e4812b6acaa0e24d5e633c0c882e19c6afa9 (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
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315633 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/MSP430')
-rw-r--r-- | lib/Target/MSP430/MSP430TargetMachine.cpp | 6 | ||||
-rw-r--r-- | lib/Target/MSP430/MSP430TargetMachine.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Target/MSP430/MSP430TargetMachine.cpp b/lib/Target/MSP430/MSP430TargetMachine.cpp index 01f44e266d7..44f16941d6e 100644 --- a/lib/Target/MSP430/MSP430TargetMachine.cpp +++ b/lib/Target/MSP430/MSP430TargetMachine.cpp @@ -49,9 +49,9 @@ MSP430TargetMachine::MSP430TargetMachine(const Target &T, const Triple &TT, Optional<Reloc::Model> RM, Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT) - : LLVMTargetMachine(T, computeDataLayout(TT, CPU, Options), TT, CPU, FS, - Options, getEffectiveRelocModel(RM), - getEffectiveCodeModel(CM), OL), + : TargetMachine(T, computeDataLayout(TT, CPU, Options), TT, CPU, FS, + Options, getEffectiveRelocModel(RM), + getEffectiveCodeModel(CM), OL), TLOF(make_unique<TargetLoweringObjectFileELF>()), Subtarget(TT, CPU, FS, *this) { initAsmInfo(); diff --git a/lib/Target/MSP430/MSP430TargetMachine.h b/lib/Target/MSP430/MSP430TargetMachine.h index 97b5e810a1d..bd32004b980 100644 --- a/lib/Target/MSP430/MSP430TargetMachine.h +++ b/lib/Target/MSP430/MSP430TargetMachine.h @@ -23,7 +23,7 @@ namespace llvm { /// MSP430TargetMachine /// -class MSP430TargetMachine : public LLVMTargetMachine { +class MSP430TargetMachine : public TargetMachine { std::unique_ptr<TargetLoweringObjectFile> TLOF; MSP430Subtarget Subtarget; |