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 | bb8507e63c42212c3753c0df069ec16a52652247 (patch) | |
| tree | 8579aed34d69ff21da87b58f3376ad5f5282966f /llvm/lib/Target/ARM/ARMTargetMachine.cpp | |
| parent | a2f9e3a60fb97bf82a1029207ee81221fe13b3d5 (diff) | |
| download | bcm5719-llvm-bb8507e63c42212c3753c0df069ec16a52652247.tar.gz bcm5719-llvm-bb8507e63c42212c3753c0df069ec16a52652247.zip | |
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
Diffstat (limited to 'llvm/lib/Target/ARM/ARMTargetMachine.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMTargetMachine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index bc8f299db56..9a191e42247 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -205,9 +205,9 @@ ARMBaseTargetMachine::ARMBaseTargetMachine(const Target &T, const Triple &TT, Optional<Reloc::Model> RM, Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool isLittle) - : TargetMachine(T, computeDataLayout(TT, CPU, Options, isLittle), TT, - CPU, FS, Options, getEffectiveRelocModel(TT, RM), - getEffectiveCodeModel(CM), OL), + : LLVMTargetMachine(T, computeDataLayout(TT, CPU, Options, isLittle), TT, + CPU, FS, Options, getEffectiveRelocModel(TT, RM), + getEffectiveCodeModel(CM), OL), TargetABI(computeTargetABI(TT, CPU, Options)), TLOF(createTLOF(getTargetTriple())), isLittle(isLittle) { |
