Mesa (master): scons: Disable -mstackrealign on MinGW again.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Feb 10 16:29:20 UTC 2011


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Feb 10 12:16:26 2011 +0000

scons: Disable -mstackrealign on MinGW again.

It's still broken, however it doesn't show up on debug builds.

---

 scons/gallium.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index c414427..322b23b 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -349,12 +349,15 @@ def generate(env):
                 '-m32',
                 #'-march=pentium4',
             ]
-            if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2'):
+            if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2') \
+               and (platform != 'windows' or env['build'] == 'debug' or True):
                 # NOTE: We need to ensure stack is realigned given that we
                 # produce shared objects, and have no control over the stack
                 # alignment policy of the application. Therefore we need
                 # -mstackrealign ore -mincoming-stack-boundary=2.
                 #
+                # XXX: -O and -mstackrealign causes stack corruption on MinGW
+                #
                 # XXX: We could have SSE without -mstackrealign if we always used
                 # __attribute__((force_align_arg_pointer)), but that's not
                 # always the case.




More information about the mesa-commit mailing list