diff options
| author | Michel Dänzer <[email protected]> | 2014-09-03 11:36:34 +0900 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2014-09-03 09:15:01 -0700 |
| commit | 58b386dce435d2d82c2dc80b1a8d1373bb3e0ac6 (patch) | |
| tree | 5ee49af491cf6ab0a70ddbc65a1397221cc42a62 /src/gallium | |
| parent | 8abdc3c4a9c81e359d5dc1694253b05dd5562c95 (diff) | |
gallivm: Fix build against LLVM SVN >= r216982
Only MCJIT is available anymore.
Reviewed-by: Roland Scheidegger <[email protected]>
Signed-off-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_init.c | 9 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c index 8b8686dd2dd..ce87b8ce932 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 55aa8b9bda7..2fd85a82090 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. |