aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2015-03-23 14:37:24 +0000
committerTom Stellard <[email protected]>2015-03-23 14:43:10 +0000
commit769b366b83dcc12bfe06935f816023cdcfbdf578 (patch)
tree0650fef4c21d8354bdefa922984d2f7a442470e4 /src/gallium
parent7932b30892ef898ec4c74ac1f972cb462f19962b (diff)
gallivm: Use MCInstrInfo in the disassembler for querying instruction info
This fixes the build since llvm r232885 and also simplifies the code.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 2c4ed21edd4..bf6268b3360 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -276,12 +276,6 @@ disassemble(const void* func, llvm::raw_ostream & Out)
#endif
OwningPtr<TargetMachine> TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options));
-#if HAVE_LLVM >= 0x0306
- const TargetInstrInfo *TII = TM->getSubtargetImpl()->getInstrInfo();
-#else
- const TargetInstrInfo *TII = TM->getInstrInfo();
-#endif
-
/*
* Wrap the data in a MemoryObject
*/
@@ -336,7 +330,7 @@ disassemble(const void* func, llvm::raw_ostream & Out)
pc += Size;
- const MCInstrDesc &TID = TII->get(Inst.getOpcode());
+ const MCInstrDesc &TID = MII->get(Inst.getOpcode());
/*
* Keep track of forward jumps to a nearby address.