From: Michel Dänzer <michel.daen...@amd.com>
Only MCJIT is available anymore.
Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
---
src/gallium/auxiliary/gallivm/lp_bld_init.c | 9 +++++++++
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++
2 files changed, 11 insertions(+)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c
b/src/gallium/auxiliary/gallivm/lp_bld_init.c
index 8b8686d..ce87b8c 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
@@ -43,6 +43,14 @@
#include <llvm-c/BitWriter.h>
+/* Only MCJIT is available as of LLVM SVN r216982 */
+#if HAVE_LLVM >= 0x0306
+
+#define USE_MCJIT 1
+#define HAVE_AVX 1
+
+#else
+
/**
* AVX is supported in:
* - standard JIT from LLVM 3.2 onwards
@@ -64,6 +72,7 @@
# define HAVE_AVX 0
#endif
+#endif /* HAVE_LLVM >= 0x0306 */
#if USE_MCJIT
void LLVMLinkInMCJIT();
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 55aa8b9..2fd85a8 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -456,7 +456,9 @@
lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
.setOptLevel((CodeGenOpt::Level)OptLevel);
if (useMCJIT) {
+#if HAVE_LLVM < 0x0306
builder.setUseMCJIT(true);
+#endif
#ifdef _WIN32
/*
* MCJIT works on Windows, but currently only through ELF object format.
--
2.1.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
