diff options
| author | Brian Paul <brianp@vmware.com> | 2011-09-21 07:24:00 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-12-05 08:58:18 -0700 |
| commit | 7a18f005ed311b4d57ad863a08392160aa0d7c83 (patch) | |
| tree | f82717b8fe98e27571980a9ce75763dea1d7ae16 | |
| parent | 95a3724c698ac5deace2be084df945960fd7c80d (diff) | |
gallivm: fix build with llvm 3.0svn
https://bugs.freedesktop.org/show_bug.cgi?id=41065
(cherry picked from commit 51002968c97758c30511eefab1bd1358b8380e15)
| -rw-r--r-- | 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 b9892d6157f..f44749d63ab 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); |