Mesa (master): gallivm: Fix x86 build with llvm-3.0svn.
Vinson Lee
vlee at kemper.freedesktop.org
Fri Jun 24 03:51:26 UTC 2011
Module: Mesa
Branch: master
Commit: ad7387fe12c034d32da4bf4e078d494cbaca5288
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad7387fe12c034d32da4bf4e078d494cbaca5288
Author: Vinson Lee <vlee at vmware.com>
Date: Thu Jun 23 20:48:05 2011 -0700
gallivm: Fix x86 build with llvm-3.0svn.
LLVM revision 133739 renamed StackAlignment to StackAlignmentOverride.
---
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index d2d7ecc..85fabc5 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -83,8 +83,12 @@ lp_set_target_options(void)
* to only assume a 4 bytes alignment for backwards compatibility.
*/
#if defined(PIPE_ARCH_X86)
+#if HAVE_LLVM >= 0x0300
+ llvm::StackAlignmentOverride = 4;
+#else
llvm::StackAlignment = 4;
#endif
+#endif
#if defined(DEBUG) || defined(PROFILE)
llvm::NoFramePointerElim = true;
More information about the mesa-commit
mailing list