From 3d7bd81ea3ef55184e47ccac6b118e8fcf47ef66 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Wed, 8 Oct 2014 09:09:57 +0000 Subject: [PATCH] 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 R=machenbach@chromium.org LOG=y Review URL: https://codereview.chromium.org/637303002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24457 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- build/standalone.gypi | 15 ++++++++++++++- build/toolchain.gypi | 8 -------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build/standalone.gypi b/build/standalone.gypi index b09122b53..aee7832c2 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -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 + }], ], }, }, diff --git a/build/toolchain.gypi b/build/toolchain.gypi index b04f661d8..c3a9a1b3c 100644 --- a/build/toolchain.gypi +++ b/build/toolchain.gypi @@ -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': { -- 2.34.1