Revision: 24457
Author:   [email protected]
Date:     Wed Oct  8 09:09:57 2014 UTC
Log:      Don't enable WPO on Win64 and require Server 2003 / x64 for win64

WPO was only enabled to work around an issue with the Isolate's static
initializer which no longer exists.

Requiring XP on Win64 doesn't make sense.

BUG=421363
[email protected]
LOG=y

Review URL: https://codereview.chromium.org/637303002
https://code.google.com/p/v8/source/detail?r=24457

Modified:
 /branches/bleeding_edge/build/standalone.gypi
 /branches/bleeding_edge/build/toolchain.gypi

=======================================
--- /branches/bleeding_edge/build/standalone.gypi Thu Sep 4 09:23:50 2014 UTC +++ /branches/bleeding_edge/build/standalone.gypi Wed Oct 8 09:09:57 2014 UTC
@@ -313,9 +313,15 @@
           },
           'VCLibrarianTool': {
             'AdditionalOptions': ['/ignore:4221'],
+            'conditions': [
+              ['v8_target_arch=="x64"', {
+                'TargetMachine': '17',  # x64
+              }, {
+                'TargetMachine': '1',  # ia32
+              }],
+            ],
           },
           'VCLinkerTool': {
-            'MinimumRequiredVersion': '5.01',  # XP.
             'AdditionalDependencies': [
               'ws2_32.lib',
             ],
@@ -340,6 +346,13 @@
                   'advapi32.lib',
                 ],
               }],
+              ['v8_target_arch=="x64"', {
+                'MinimumRequiredVersion': '5.02',  # Server 2003.
+                'TargetMachine': '17',  # x64
+              }, {
+                'MinimumRequiredVersion': '5.01',  # XP.
+                'TargetMachine': '1',  # ia32
+              }],
             ],
           },
         },
=======================================
--- /branches/bleeding_edge/build/toolchain.gypi Wed Oct 1 09:17:19 2014 UTC +++ /branches/bleeding_edge/build/toolchain.gypi Wed Oct 8 09:09:57 2014 UTC
@@ -790,10 +790,6 @@
               }, {
                 'RuntimeLibrary': '1',  #/MTd
               }],
-              ['v8_target_arch=="x64"', {
-                # TODO(2207): remove this option once the bug is fixed.
-                'WholeProgramOptimization': 'true',
-              }],
             ],
           },
           'VCLinkerTool': {
@@ -963,10 +959,6 @@
                   }, {
                     'RuntimeLibrary': '0',  #/MT
                   }],
-                  ['v8_target_arch=="x64"', {
-                    # TODO(2207): remove this option once the bug is fixed.
-                    'WholeProgramOptimization': 'true',
-                  }],
                 ],
               },
               'VCLinkerTool': {

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to