commit bb8507e63c42212c3753c0df069ec16a52652247
author Matthias Braun <matze@braunis.de> Thu Oct 12 22:57:28 2017 +0000
committer Matthias Braun <matze@braunis.de> Thu Oct 12 22:57:28 2017 +0000
tree 8579aed34d69ff21da87b58f3376ad5f5282966f
parent a2f9e3a60fb97bf82a1029207ee81221fe13b3d5

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.

llvm-svn: 315637

llvm/lib/Target/X86/X86TargetMachine.cpp

diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index b4ab877..51ae377 100644
--- a/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -200,7 +200,7 @@
                                    Optional<Reloc::Model> RM,
                                    Optional<CodeModel::Model> CM,
                                    CodeGenOpt::Level OL, bool JIT)
-    : TargetMachine(
+    : LLVMTargetMachine(
           T, computeDataLayout(TT), TT, CPU, FS, Options,
           getEffectiveRelocModel(TT, RM),
           getEffectiveCodeModel(CM, JIT, TT.getArch() == Triple::x86_64), OL),