Module: Mesa
Branch: master
Commit: 2572e3b4a17e4b0de9b5ed7fe6f4edf01abd5655
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2572e3b4a17e4b0de9b5ed7fe6f4edf01abd5655

Author: Laurent Carlier <lordhea...@gmail.com>
Date:   Wed Aug  7 00:05:25 2013 +0200

gallivm: Fix build - Remove TargetOptions.RealignStack for llvm>=3.4

Since llvm -3.4svn r187618, TargetOptions doesn't provide
RealignStack, so only enable it with llvm<3.4

This option must now be specified using function attributes, see LLVM
commit r187618

Reviewed-by: Tom Stellard <thomas.stell...@amd.com>

---

 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index e09bb78..e8d2db2 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -273,8 +273,10 @@ 
lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
    TargetOptions options;
 #if defined(PIPE_ARCH_X86)
    options.StackAlignmentOverride = 4;
+#if HAVE_LLVM < 0x0304
    options.RealignStack = true;
 #endif
+#endif
 
 #if defined(DEBUG)
    options.JITEmitDebugInfo = true;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to