summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/gallivm
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-09-21 07:24:00 -0600
committerBrian Paul <brianp@vmware.com>2011-09-21 07:24:03 -0600
commit51002968c97758c30511eefab1bd1358b8380e15 (patch)
tree03b86f9690bb82b8300faf15c611fcb29c2889fa /src/gallium/auxiliary/gallivm
parent4ef82cee6d297684bc178dc243e4d3b6c5704955 (diff)
downloadexternal_mesa3d-51002968c97758c30511eefab1bd1358b8380e15.zip
external_mesa3d-51002968c97758c30511eefab1bd1358b8380e15.tar.gz
external_mesa3d-51002968c97758c30511eefab1bd1358b8380e15.tar.bz2
gallivm: fix build with llvm 3.0svn
https://bugs.freedesktop.org/show_bug.cgi?id=41065
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index b9892d6..f44749d 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -272,7 +272,11 @@ lp_disassemble(const void* func)
if (!DisAsm->getInstruction(Inst, Size, memoryObject,
pc,
- nulls())) {
+#if HAVE_LLVM >= 0x0300
+ nulls(), nulls())) {
+#else
+ nulls())) {
+#endif
debug_printf("invalid\n");
pc += 1;
}
@@ -295,7 +299,9 @@ lp_disassemble(const void* func)
* Print the instruction.
*/
-#if HAVE_LLVM >= 0x208
+#if HAVE_LLVM >= 0x0300
+ Printer->printInst(&Inst, Out, "");
+#elif HAVE_LLVM >= 0x208
Printer->printInst(&Inst, Out);
#else
Printer->printInst(&Inst);