diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2009-06-09 07:53:25 +0200 |
---|---|---|
committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-06-09 07:53:25 +0200 |
commit | ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a (patch) | |
tree | 308fa87e22a276c0f8f28fd9f0986d20b52be928 /scons | |
parent | d9617deb008b75f4a605a30408aeb1948139c33e (diff) | |
parent | 76a1017e978f8e51114d765c8c98ff25da13042b (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
Diffstat (limited to 'scons')
-rw-r--r-- | scons/gallium.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 0d5843603e..5b3c9752bc 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']: |