commit 3a9c114b2418472b16276e95d3f657735926dddb
author Matthias Braun <matze@braunis.de> Thu Oct 12 22:28:54 2017 +0000
committer Matthias Braun <matze@braunis.de> Thu Oct 12 22:28:54 2017 +0000
tree 60dfd37bb4af251fc65d401a74853b0534bcf59a
parent 150b7d6f559783d076c742e9aafc6004b31aa3e0

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

llvm-svn: 315633

llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp

diff --git a/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp b/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp
index aa76a96..d3f24c9 100644
--- a/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp
@@ -143,7 +143,7 @@
                                            Optional<Reloc::Model> RM,
                                            Optional<CodeModel::Model> CM,
                                            CodeGenOpt::Level OL, bool JIT)
-    : LLVMTargetMachine(
+    : TargetMachine(
           T, computeDataLayout(TT, CPU, FS), TT, CPU, FS, Options,
           getEffectiveRelocModel(RM),
           getEffectiveCodeModel(CM, getEffectiveRelocModel(RM), JIT), OL),