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/X86/X86TargetMachine.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/X86/X86TargetMachine.cpp')
| -rw-r--r-- | lib/Target/X86/X86TargetMachine.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index c804195f27..ed5e6f5227 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -50,8 +50,7 @@ X86_32TargetMachine::X86_32TargetMachine(const Target &T, StringRef TT, InstrInfo(*this), TSInfo(*this), TLInfo(*this), - JITInfo(*this), - STTI(&TLInfo) { + JITInfo(*this) { } void X86_64TargetMachine::anchor() { } @@ -70,8 +69,7 @@ X86_64TargetMachine::X86_64TargetMachine(const Target &T, StringRef TT, InstrInfo(*this), TSInfo(*this), TLInfo(*this), - JITInfo(*this), - STTI(&TLInfo) { + JITInfo(*this) { } /// X86TargetMachine ctor - Create an X86 target. |