Mesa (master): gallivm: Fix LLVM-2.7 build.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Feb 2 09:10:30 UTC 2012
Module: Mesa
Branch: master
Commit: db312b62f2237ea5fd5a98f04550b862c116a392
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=db312b62f2237ea5fd5a98f04550b862c116a392
Author: ojab <ojab at ojab.ru>
Date: Wed Feb 1 10:00:10 2012 +0400
gallivm: Fix LLVM-2.7 build.
Signed-off-by: José Fonseca <jfonseca at vmware.com>
Tested-by: Vinson Lee <vlee at freedesktop.org>
---
src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 33881ad..be8d788 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
More information about the mesa-commit
mailing list