Module: Mesa
Branch: master
Commit: 645f77fe50c1f04eb77d03b3feaaa5fd36d1d1a4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=645f77fe50c1f04eb77d03b3feaaa5fd36d1d1a4
Author: Nick Sarnie <commendsar...@gmail.com>
Date: Sun Apr 19 23:51:26 2015 -0400
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 <commendsar...@gmail.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daen...@amd.com>
---
src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 2 +-
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +-
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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
