From 22c970946535956abac321585598425ad5cc82c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 14 May 2014 12:55:50 +0100 Subject: [PATCH 1/2] gallivm: Disable workaround for PR12833 on LLVM 3.2+. Fixed upstream. (cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e) --- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index d85adfb..45c985d 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -321,11 +321,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager()); ExecutionEngine *JIT; -#if 0 +#if HAVE_LLVM >= 0x0302 JIT = builder.create(); #else /* - * Workaround http://llvm.org/bugs/show_bug.cgi?id=12833 + * Workaround http://llvm.org/PR12833 */ StringRef MArch = ""; StringRef MCPU = ""; -- 2.1.0