From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 25 Nov 2014 22:11:42 +0000 (+0000)
Subject: scons: Remove dead code/comments.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0473577f91c1e7fd96c6229eae6132c6a46b1fa7;p=mesa.git

scons: Remove dead code/comments.

- Remove no-op if-clause.

- -mstackrealign has been enabled again on MinGW for quite some time and
  appears to work alright nowadays.

- Drop -mmmx option as it is implied my -msse, and we don't use MMX
  intrinsics anyway.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/scons/gallium.py b/scons/gallium.py
index 4df6e1ac275..fe800fa0f71 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -378,21 +378,18 @@ def generate(env):
                 #'-march=pentium4',
             ]
             if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2') \
-               and (platform != 'windows' or env['build'] == 'debug' or True) \
                and platform != 'haiku':
                 # 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.
                 ccflags += [
                     '-mstackrealign', # ensure stack is aligned
-                    '-mmmx', '-msse', '-msse2', # enable SIMD intrinsics
+                    '-msse', '-msse2', # enable SIMD intrinsics
                     #'-mfpmath=sse',
                 ]
             if platform in ['windows', 'darwin']: