[Mesa-dev] [PATCH] gallivm: Fix build with llvm-3.0 and llvm-2.9

Tobias Droste tdroste at gmx.de
Mon Mar 28 12:48:44 PDT 2011


This is a follow up to 40ae214067673edbda79371969d1730b6194d83e. As
Vinson Lee noticed, those changes were made in 3.0svn not 2.9rc. So the
previous patch fixed 3.0svn, but broke build with 2.9. I only checked
2.8 and the snapshot. Sorry for that.

Signed-off-by: Tobias Droste <tdroste at gmx.de>
---
 src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 76d63ce..0b724a3 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -209,12 +209,12 @@ lp_disassemble(const void* func)
    raw_debug_ostream Out;
    TargetMachine *TM = T->createTargetMachine(Triple, "");
 
-#if HAVE_LLVM >= 0x0209
+#if HAVE_LLVM >= 0x0300
    unsigned int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
 #else
    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
 #endif
-#if HAVE_LLVM >= 0x0209
+#if HAVE_LLVM >= 0x0300
    OwningPtr<MCInstPrinter> Printer(
          T->createMCInstPrinter(*TM, AsmPrinterVariant, *AsmInfo));
 #elif HAVE_LLVM >= 0x0208
-- 
1.7.3.4



More information about the mesa-dev mailing list