Mesa (10.2): gallivm: Disable workaround for PR12833 on LLVM 3.2+.

Emil Velikov evelikov at kemper.freedesktop.org
Wed Sep 17 02:31:27 UTC 2014


Module: Mesa
Branch: 10.2
Commit: ff935f267ea67933bbafb661f2b8257179435450
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff935f267ea67933bbafb661f2b8257179435450

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed May 14 12:55:50 2014 +0100

gallivm: Disable workaround for PR12833 on LLVM 3.2+.

Fixed upstream.

(cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e)
Nominated-by: Evangelos Foutras <evangelos at foutrelis.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83735

---

 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 = "";




More information about the mesa-commit mailing list