summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2014-05-14 12:55:50 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-09-17 01:20:04 +0100
commitff935f267ea67933bbafb661f2b8257179435450 (patch)
treeb313532949a39071f2f71afe045185283f9f5fe8 /src
parentbe5e98ac2b639e60abae848929121db32cb426b3 (diff)
gallivm: Disable workaround for PR12833 on LLVM 3.2+.
Fixed upstream. (cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e) Nominated-by: Evangelos Foutras <evangelos@foutrelis.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83735
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_misc.cpp4
1 files 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 d85adfbec02..45c985dd656 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 = "";