From: Vinson Lee <vlee@vmware.com>
Date: Fri, 24 Jun 2011 03:48:05 +0000 (-0700)
Subject: gallivm: Fix x86 build with llvm-3.0svn.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad7387fe12c034d32da4bf4e078d494cbaca5288;p=mesa.git

gallivm: Fix x86 build with llvm-3.0svn.

LLVM revision 133739 renamed StackAlignment to StackAlignmentOverride.
---

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index d2d7eccd92f..85fabc574b2 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;