summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Sarnie <commendsarnex@gmail.com>2015-04-19 23:51:26 -0400
committerMichel Dänzer <michel@daenzer.net>2015-04-20 13:34:45 +0900
commit645f77fe50c1f04eb77d03b3feaaa5fd36d1d1a4 (patch)
tree16abaf133ddcc512fac38a77f84f4f63f7596c07
parentc015008ee07745d29dde3502c1e2b34a1127d33e (diff)
downloadexternal_mesa3d-645f77fe50c1f04eb77d03b3feaaa5fd36d1d1a4.zip
external_mesa3d-645f77fe50c1f04eb77d03b3feaaa5fd36d1d1a4.tar.gz
external_mesa3d-645f77fe50c1f04eb77d03b3feaaa5fd36d1d1a4.tar.bz2
gallivm: Fix build against LLVM 3.7 SVN r235265
LLVM removed JITEmitDebugInfo from TargetOptions since they weren't used v2: Be consistent with the LLVM version check (Aaron Watry) Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp2
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_misc.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 65d2896..be3e834 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -270,7 +270,7 @@ disassemble(const void* func, llvm::raw_ostream & Out)
}
TargetOptions options;
-#if defined(DEBUG)
+#if defined(DEBUG) && HAVE_LLVM < 0x0307
options.JITEmitDebugInfo = true;
#endif
#if defined(PIPE_ARCH_X86)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 4ede90b..5e8a634 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -429,7 +429,7 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
#endif
#endif
-#if defined(DEBUG)
+#if defined(DEBUG) && HAVE_LLVM < 0x0307
options.JITEmitDebugInfo = true;
#endif