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/NVPTX | |
| 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/NVPTX')
| -rw-r--r-- | lib/Target/NVPTX/NVPTXTargetMachine.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/NVPTX/NVPTXTargetMachine.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/lib/Target/NVPTX/NVPTXTargetMachine.cpp index 393d256883b..85f757878f9 100644 --- a/lib/Target/NVPTX/NVPTXTargetMachine.cpp +++ b/lib/Target/NVPTX/NVPTXTargetMachine.cpp @@ -100,8 +100,8 @@ NVPTXTargetMachine::NVPTXTargetMachine(const Target &T, const Triple &TT, CodeGenOpt::Level OL, bool is64bit) // The pic relocation model is used regardless of what the client has // specified, as it is the only relocation model currently supported. - : TargetMachine(T, computeDataLayout(is64bit), TT, CPU, FS, Options, - Reloc::PIC_, getEffectiveCodeModel(CM), OL), + : LLVMTargetMachine(T, computeDataLayout(is64bit), TT, CPU, FS, Options, + Reloc::PIC_, getEffectiveCodeModel(CM), OL), is64bit(is64bit), TLOF(llvm::make_unique<NVPTXTargetObjectFile>()), Subtarget(TT, CPU, FS, *this) { if (TT.getOS() == Triple::NVCL) diff --git a/lib/Target/NVPTX/NVPTXTargetMachine.h b/lib/Target/NVPTX/NVPTXTargetMachine.h index 8bea331580a..7674135f0a7 100644 --- a/lib/Target/NVPTX/NVPTXTargetMachine.h +++ b/lib/Target/NVPTX/NVPTXTargetMachine.h @@ -24,7 +24,7 @@ namespace llvm { /// NVPTXTargetMachine /// -class NVPTXTargetMachine : public TargetMachine { +class NVPTXTargetMachine : public LLVMTargetMachine { bool is64bit; std::unique_ptr<TargetLoweringObjectFile> TLOF; NVPTX::DrvInterface drvInterface; |