From: yangguo@chromium.org <yangguo@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Fri, 5 Aug 2011 10:00:35 +0000 (+0000)
Subject: Specify stack size for win64 when linking d8.
X-Git-Tag: upstream/4.7.83~18763
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57bd101494aa1ce3ef362cdb2a57b96b935c3794;p=platform%2Fupstream%2Fv8.git

Specify stack size for win64 when linking d8.

Review URL: http://codereview.chromium.org/7574008

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8841 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/SConstruct b/SConstruct
index 8e16a78..04c1d4b 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']
+      }
     }
   }
 }
diff --git a/build/common.gypi b/build/common.gypi
index 39a468f..5a3da52 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -30,6 +30,7 @@
     'library%': 'static_library',
     'component%': 'static_library',
     'visibility%': 'hidden',
+    'msvs_multi_core_compile%': '1',
     'variables': {
       'conditions': [
         [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 8606a2e..fe2d456 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -169,6 +169,10 @@
               },
               'VCLinkerTool': {
                 'LinkIncremental': '2',
+                # For future reference, the stack size needs to be increased
+                # when building for Windows 64-bit, otherwise some test cases
+                # can cause stack overflow.
+                # 'StackReserveSize': '297152',
               },
             },
             'conditions': [
@@ -239,6 +243,10 @@
                     'OptimizeReferences': '2',
                     'OptimizeForWindows98': '1',
                     'EnableCOMDATFolding': '2',
+                    # For future reference, the stack size needs to be
+                    # increased when building for Windows 64-bit, otherwise
+                    # some test cases can cause stack overflow.
+                    # 'StackReserveSize': '297152',
                   },
                 },
               }],