Mesa (7.11): gallivm: Rename TargetInstrDesc to MCInstrDesc when using llvm-3.0.
Brian Paul
brianp at kemper.freedesktop.org
Mon Dec 5 16:02:59 UTC 2011
Module: Mesa
Branch: 7.11
Commit: a3337a66ef6fa5fe0e15ecb53e1a30e7d7172ac3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3337a66ef6fa5fe0e15ecb53e1a30e7d7172ac3
Author: Vinson Lee <vlee at vmware.com>
Date: Thu Jun 30 15:07:57 2011 -0700
gallivm: Rename TargetInstrDesc to MCInstrDesc when using llvm-3.0.
llvm-3.0svn revision 134021 renamed TargetInstrDesc to MCInstrDesc.
(cherry picked from commit b61e56756c2d61a94a8dd90abb4dc83e0c0349ae)
---
src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 8636cd6..29dfb86 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -289,7 +289,11 @@ lp_disassemble(const void* func)
pc += Size;
+#if HAVE_LLVM >= 0x0300
+ const MCInstrDesc &TID = TII->get(Inst.getOpcode());
+#else
const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
+#endif
/*
* Keep track of forward jumps to a nearby address.
More information about the mesa-commit
mailing list