From: ojab <ojab@ojab.ru>
Date: Wed, 1 Feb 2012 06:00:10 +0000 (+0400)
Subject: gallivm: Fix LLVM-2.7 build.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db312b62f2237ea5fd5a98f04550b862c116a392;p=mesa.git

gallivm: Fix LLVM-2.7 build.

Signed-off-by: José Fonseca <jfonseca@vmware.com>
Tested-by: Vinson Lee <vlee@freedesktop.org>
---

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 33881adf18b..be8d7884bca 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -199,13 +199,15 @@ lp_disassemble(const void* func)
 
 #if HAVE_LLVM >= 0x0208
    InitializeNativeTargetAsmPrinter();
-#else
-   InitializeAllAsmPrinters();
+#elif LLVM_NATIVE_ARCH == X86Target
+   LLVMInitializeX86AsmPrinter();
+#elif LLVM_NATIVE_ARCH == ARMTarget
+   LLVMInitializeARMAsmPrinter();
 #endif
 
-#if LLVM_NATIVE_ARCH == X86
+#if (LLVM_NATIVE_ARCH == X86 || LLVM_NATIVE_ARCH == X86Target)
    LLVMInitializeX86Disassembler();
-#elif LLVM_NATIVE_ARCH == ARM
+#elif (LLVM_NATIVE_ARCH == ARM || LLVM_NATIVE_ARCH == ARMTarget)
    LLVMInitializeARMDisassembler();
 #endif