X86Target is a variable, and therefore isn't defined at compile time. So LLVM_NATIVE_ARCH == X86Target is translated into 0 == 0 and since X86 is first, we always pick it.
Therefore we replace the logic with PIPE_ARCH_*. https://bugs.freedesktop.org/show_bug.cgi?id=45420 --- 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 be8d788..26578a1 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -199,15 +199,17 @@ lp_disassemble(const void* func) #if HAVE_LLVM >= 0x0208 InitializeNativeTargetAsmPrinter(); -#elif LLVM_NATIVE_ARCH == X86Target +#elif defined(PIPE_ARCH_X86) LLVMInitializeX86AsmPrinter(); -#elif LLVM_NATIVE_ARCH == ARMTarget +#elif defined(PIPE_ARCH_ARM) LLVMInitializeARMAsmPrinter(); +#elif defined(PIPE_ARCH_PPC) + LLVMInitializePowerPCAsmPrinter(); #endif -#if (LLVM_NATIVE_ARCH == X86 || LLVM_NATIVE_ARCH == X86Target) +#if defined(PIPE_ARCH_X86) LLVMInitializeX86Disassembler(); -#elif (LLVM_NATIVE_ARCH == ARM || LLVM_NATIVE_ARCH == ARMTarget) +#elif defined(PIPE_ARCH_ARM) LLVMInitializeARMDisassembler(); #endif -- 1.7.7.3 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
