diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-18 14:20:07 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-18 14:20:07 -0700 |
| commit | 556121338c248ba1bb49b369388b697250e848c3 (patch) | |
| tree | 0dc5059be0416f7d806424759f08a177279f0c11 /lib/Target/Mips/MipsTargetMachine.cpp | |
| parent | 722d055f70a29c4af58c60dde2682cecc9003f41 (diff) | |
| parent | 3298959540ca744ec16b4c65db244534a929a862 (diff) | |
Merge commit '3298959540ca744ec16b4c65db244534a929a862'
Conflicts:
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp
Diffstat (limited to 'lib/Target/Mips/MipsTargetMachine.cpp')
| -rw-r--r-- | lib/Target/Mips/MipsTargetMachine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/Mips/MipsTargetMachine.cpp b/lib/Target/Mips/MipsTargetMachine.cpp index 5e8062373f..199fe5f0d3 100644 --- a/lib/Target/Mips/MipsTargetMachine.cpp +++ b/lib/Target/Mips/MipsTargetMachine.cpp @@ -53,7 +53,7 @@ MipsTargetMachine(const Target &T, StringRef TT, InstrInfo(MipsInstrInfo::create(*this)), FrameLowering(MipsFrameLowering::create(*this, Subtarget)), TLInfo(*this), TSInfo(*this), JITInfo(), - ELFWriterInfo(false, isLittle), STTI(&TLInfo) { + ELFWriterInfo(false, isLittle) { } void MipsebTargetMachine::anchor() { } |