Module: Mesa Branch: 7.11 Commit: 7a18f005ed311b4d57ad863a08392160aa0d7c83 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a18f005ed311b4d57ad863a08392160aa0d7c83
Author: Brian Paul <[email protected]> Date: Wed Sep 21 07:24:00 2011 -0600 gallivm: fix build with llvm 3.0svn https://bugs.freedesktop.org/show_bug.cgi?id=41065 (cherry picked from commit 51002968c97758c30511eefab1bd1358b8380e15) --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 10 ++++++++-- 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
