summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorojab <ojab@ojab.ru>2012-02-01 10:00:10 +0400
committerJosé Fonseca <jfonseca@vmware.com>2012-02-02 09:04:10 +0000
commitdb312b62f2237ea5fd5a98f04550b862c116a392 (patch)
treef69fedd42ab98fb173dc7e26ed202558a644d9dc /src/gallium/auxiliary
parent54fd495c41d39a228ca87de9c8f7ebf4a06cd740 (diff)
downloadexternal_mesa3d-db312b62f2237ea5fd5a98f04550b862c116a392.zip
external_mesa3d-db312b62f2237ea5fd5a98f04550b862c116a392.tar.gz
external_mesa3d-db312b62f2237ea5fd5a98f04550b862c116a392.tar.bz2
gallivm: Fix LLVM-2.7 build.
Signed-off-by: José Fonseca <jfonseca@vmware.com> Tested-by: Vinson Lee <vlee@freedesktop.org>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp10
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