Mesa (mesa_7_5_branch): Revert "scons: Less aggressive optimizations for MSVC 64bit compiler."

[Jose Fonseca]

Module: Mesa
Branch: mesa_7_5_branch
Commit: 78dad275646b720511dac31ca6ba0535568af81f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=78dad275646b720511dac31ca6ba0535568af81f

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Jun  4 10:34:02 2009 -0700

Revert "scons: Less aggressive optimizations for MSVC 64bit compiler."

This reverts commit fc7f92478286041a018ac4e72d2ccedeea7c0eca.

---

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

diff --git a/scons/gallium.py b/scons/gallium.py
index 0d58436..5b3c975 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -362,23 +362,8 @@ def generate(env):
               '/GL-', # disable whole program optimization
             ]
         else:
-            if env['machine'] == 'x86_64':
-                cflags += [
-                    # Same as /O2, but without global optimizations or auto-inlining
-                    # http://msdn.microsoft.com/en-us/library/8f8h5cxt.aspx
-                    '/Ob1', # enable inline expansion, disable auto-inlining
-                    '/Oi', # enable intrinsic functions
-                    '/Ot', # favors fast code
-                    '/Oy', # omit frame pointer
-                    '/Gs', # enable stack probes
-                    '/GF', # eliminate duplicate strings
-                    '/Gy', # enable function-level linking
-                ]
-            else:
-                cflags += [
-                    '/O2', # optimize for speed
-                ]
             cflags += [
+                '/O2', # optimize for speed
                 #'/fp:fast', # fast floating point 
             ]
         if env['profile']: