summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Carlier <[email protected]>2013-08-07 00:05:25 +0200
committerTom Stellard <[email protected]>2013-08-06 15:31:48 -0700
commit2572e3b4a17e4b0de9b5ed7fe6f4edf01abd5655 (patch)
tree066a750580728c187ec6333b40360c7d345d1902
parent0f7a15a2479a3fec6e3d96166e3c11ebb0d56eed (diff)
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 <[email protected]>
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_misc.cpp2
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 e09bb78de17..e8d2db292ea 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;