Reviewers: Rico, jkummerow,
Message:
PTAL.
This should take care of buildbot failures for Win64.
http://codereview.chromium.org/7574008/diff/1/SConstruct
File SConstruct (right):
http://codereview.chromium.org/7574008/diff/1/SConstruct#newcode439
SConstruct:439: 'LINKFLAGS': ['/STACK:2097152']
Somebody swapped the digits when copying 2^21 :)
Description:
Specify stack size for win64 when linking d8.
Please review this at http://codereview.chromium.org/7574008/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M SConstruct
M build/common.gypi
Index: SConstruct
diff --git a/SConstruct b/SConstruct
index
8e16a7824e39c462ec98807e32320f83485ae9ae..04c1d4b85b3b41d76736649070178a0bcb655c2c
100644
--- a/SConstruct
+++ b/SConstruct
@@ -436,7 +436,7 @@ CCTEST_EXTRA_FLAGS = {
},
'arch:x64': {
'CPPDEFINES': ['V8_TARGET_ARCH_X64'],
- 'LINKFLAGS': ['/STACK:2091752']
+ 'LINKFLAGS': ['/STACK:2097152']
},
}
}
@@ -601,7 +601,7 @@ SAMPLE_FLAGS = {
},
'arch:x64': {
'CPPDEFINES': ['V8_TARGET_ARCH_X64', 'WIN32'],
- 'LINKFLAGS': ['/MACHINE:X64', '/STACK:2091752']
+ 'LINKFLAGS': ['/MACHINE:X64', '/STACK:2097152']
},
'mode:debug': {
'CCFLAGS': ['/Od'],
@@ -756,7 +756,7 @@ PREPARSER_FLAGS = {
},
'arch:x64': {
'CPPDEFINES': ['V8_TARGET_ARCH_X64', 'WIN32'],
- 'LINKFLAGS': ['/MACHINE:X64', '/STACK:2091752']
+ 'LINKFLAGS': ['/MACHINE:X64', '/STACK:2097152']
},
'mode:debug': {
'CCFLAGS': ['/Od'],
@@ -822,6 +822,57 @@ D8_FLAGS = {
'msvc': {
'all': {
'LIBS': ['winmm', 'ws2_32']
+ },
+ 'verbose:off': {
+ 'CCFLAGS': ['/nologo'],
+ 'LINKFLAGS': ['/NOLOGO']
+ },
+ 'verbose:on': {
+ 'LINKFLAGS': ['/VERBOSE']
+ },
+ 'prof:on': {
+ 'LINKFLAGS': ['/MAP']
+ },
+ 'mode:release': {
+ 'CCFLAGS': ['/O2'],
+ 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF'],
+ 'msvcrt:static': {
+ 'CCFLAGS': ['/MT']
+ },
+ 'msvcrt:shared': {
+ 'CCFLAGS': ['/MD']
+ },
+ 'msvcltcg:on': {
+ 'CCFLAGS': ['/GL'],
+ 'pgo:off': {
+ 'LINKFLAGS': ['/LTCG'],
+ },
+ },
+ 'pgo:instrument': {
+ 'LINKFLAGS': ['/LTCG:PGI']
+ },
+ 'pgo:optimize': {
+ 'LINKFLAGS': ['/LTCG:PGO']
+ }
+ },
+ 'arch:ia32': {
+ 'CPPDEFINES': ['V8_TARGET_ARCH_IA32', 'WIN32'],
+ 'LINKFLAGS': ['/MACHINE:X86']
+ },
+ 'arch:x64': {
+ 'CPPDEFINES': ['V8_TARGET_ARCH_X64', 'WIN32'],
+ 'LINKFLAGS': ['/MACHINE:X64', '/STACK:2097152']
+ },
+ 'mode:debug': {
+ 'CCFLAGS': ['/Od'],
+ 'LINKFLAGS': ['/DEBUG'],
+ 'CPPDEFINES': ['DEBUG'],
+ 'msvcrt:static': {
+ 'CCFLAGS': ['/MTd']
+ },
+ 'msvcrt:shared': {
+ 'CCFLAGS': ['/MDd']
+ }
}
}
}
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index
702049581c1d3a2407459faf0de26a5c351b426d..3324720016ca0156b884d22f5ab3112ff61099a3
100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -136,6 +136,11 @@
# 1 == /SUBSYSTEM:CONSOLE
# 2 == /SUBSYSTEM:WINDOWS
'SubSystem': '1',
+ 'conditions': [
+ ['target_arch=="x64"', {
+ 'StackReserveSize': '2097152',
+ }],
+ ],
},
},
},
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
