Mesa (master): gallivm: Fix build with LLVM >= 3.4 r181680.

Tom Stellard tstellar at kemper.freedesktop.org
Tue May 14 16:06:24 UTC 2013


Module: Mesa
Branch: master
Commit: ff256ec0686bad0ccf3c9df99ba442773efbc181
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff256ec0686bad0ccf3c9df99ba442773efbc181

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Sun May 12 20:37:17 2013 -0700

gallivm: Fix build with LLVM >= 3.4 r181680.

Tested-by: Laurent Carlier <lordheavym at gmail.com>
Signed-off-by: Vinson Lee <vlee at freedesktop.org>

---

 src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 86617d4..1c886ea 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -212,7 +212,9 @@ disassemble(const void* func, llvm::raw_ostream & Out)
    std::string Error;
    const Target *T = TargetRegistry::lookupTarget(Triple, Error);
 
-#if HAVE_LLVM >= 0x0300
+#if HAVE_LLVM >= 0x0304
+   OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(*T->createMCRegInfo(Triple), Triple));
+#elif HAVE_LLVM >= 0x0300
    OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
 #else
    OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));




More information about the mesa-commit mailing list