Merge up to 8597 to experimental/gc from the bleeding edge.

tools/gyp/v8.gyp

 # Copyright 2011 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 12 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 {
   'variables': {
     'use_system_v8%': 0,
     'msvs_use_common_release': 0,
     'gcc_version%': 'unknown',
-    'v8_compress_startup_data%': 'false',
+    'v8_compress_startup_data%': 'off',
     'v8_target_arch%': '<(target_arch)',
 
     # Setting 'v8_can_use_unaligned_accesses' to 'true' will allow the code
     # generated by V8 to do unaligned memory access, and setting it to 'false'
     # will ensure that the generated code will always do aligned memory
     # accesses. The default value of 'default' will try to determine the correct
     # setting. Note that for Intel architectures (ia32 and x64) unaligned memory
     # access is allowed for all CPUs.
     'v8_can_use_unaligned_accesses%': 'default',
 
@@ skipping 181 matching lines @@
                   },
                 },
               }],
             ],
           },
         },
       },
       'targets': [
         {
           'target_name': 'v8',
+          'toolsets': ['host', 'target'],
           'conditions': [
             ['v8_use_snapshot=="true"', {
               'dependencies': ['v8_snapshot'],
             },
             {
               'dependencies': ['v8_nosnapshot'],
             }],
             ['component=="shared_library"', {
               'type': '<(component)',
               'sources': [
@@ skipping 29 matching lines @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
                '../../include',
             ],
           },
         },
         {
           'target_name': 'v8_snapshot',
           'type': '<(library)',
+          'toolsets': ['host', 'target'],
           'conditions': [
             ['component=="shared_library"', {
               'conditions': [
+                # The ARM assembler assumes the host is 32 bits, so force building
+                # 32-bit host tools.
+                ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }],
                 ['OS=="win"', {
                   'defines': [
                     'BUILDING_V8_SHARED',
                   ],
                   'direct_dependent_settings': {
                     'defines': [
                       'USING_V8_SHARED',
                     ],
                   },
                 }, {
@@ skipping 223 matching lines @@
             '../../src/hydrogen-instructions.h',
             '../../src/ic-inl.h',
             '../../src/ic.cc',
             '../../src/ic.h',
             '../../src/incremental-marking.cc',
             '../../src/incremental-marking.h',
             '../../src/inspector.cc',
             '../../src/inspector.h',
             '../../src/interpreter-irregexp.cc',
             '../../src/interpreter-irregexp.h',
-            '../../src/json-parser.cc',
             '../../src/json-parser.h',
             '../../src/jsregexp.cc',
             '../../src/jsregexp.h',
             '../../src/isolate.cc',
             '../../src/isolate.h',
             '../../src/list-inl.h',
             '../../src/list.h',
             '../../src/lithium.cc',
             '../../src/lithium.h',
             '../../src/lithium-allocator.cc',
@@ skipping 96 matching lines @@
             '../../src/unicode.cc',
             '../../src/unicode.h',
             '../../src/utils-inl.h',
             '../../src/utils.cc',
             '../../src/utils.h',
             '../../src/v8-counters.cc',
             '../../src/v8-counters.h',
             '../../src/v8.cc',
             '../../src/v8.h',
             '../../src/v8checks.h',
+            '../../src/v8conversions.cc',
+            '../../src/v8conversions.h',
             '../../src/v8globals.h',
             '../../src/v8memory.h',
             '../../src/v8threads.cc',
             '../../src/v8threads.h',
+            '../../src/v8utils.cc',
             '../../src/v8utils.h',
             '../../src/variables.cc',
             '../../src/variables.h',
             '../../src/version.cc',
             '../../src/version.h',
             '../../src/vm-state-inl.h',
             '../../src/vm-state.h',
             '../../src/zone-inl.h',
             '../../src/zone.cc',
             '../../src/zone.h',
@@ skipping 239 matching lines @@
                 '<@(library_files)',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
               ],
               'action': [
                 'python',
                 '../../tools/js2c.py',
                 '<@(_outputs)',
                 'CORE',
+                '<(v8_compress_startup_data)',
                 '<@(library_files)'
               ],
             },
             {
               'action_name': 'js2c_experimental',
               'inputs': [
                 '../../tools/js2c.py',
                 '<@(experimental_library_files)',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
               ],
               'action': [
                 'python',
                 '../../tools/js2c.py',
                 '<@(_outputs)',
                 'EXPERIMENTAL',
+                '<(v8_compress_startup_data)',
                 '<@(experimental_library_files)'
               ],
             },
           ],
         },
         {
           'target_name': 'mksnapshot',
           'type': 'executable',
           'toolsets': ['host'],
           'dependencies': [
@@ skipping 14 matching lines @@
             }],
             ['v8_compress_startup_data=="bz2"', {
               'libraries': [
                 '-lbz2',
               ]}],
           ]
         },
         {
           'target_name': 'v8_shell',
           'type': 'executable',
+          'toolsets': ['host'],
           'dependencies': [
             'v8'
           ],
           'sources': [
             '../../samples/shell.cc',
           ],
           'conditions': [
             ['OS=="win"', {
               # This could be gotten by not setting chromium_code, if that's OK.
               'defines': ['_CRT_SECURE_NO_WARNINGS'],
             }],
+            # The ARM assembler assumes the host is 32 bits, so force building
+            # 32-bit host tools.
+            ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
+              'cflags': ['-m32'],
+              'ldflags': ['-m32'],
+            }],
             ['v8_compress_startup_data=="bz2"', {
               'libraries': [
                 '-lbz2',
               ]}],
           ],
         },
       ],
     }, { # use_system_v8 != 0
       'targets': [
         {
           'target_name': 'v8',
           'type': 'settings',
+          'toolsets': ['host', 'target'],
           'link_settings': {
             'libraries': [
               '-lv8',
             ],
           },
         },
         {
           'target_name': 'v8_shell',
           'type': 'none',
+          'toolsets': ['host'],
           'dependencies': [
             'v8'
           ],
         },
       ],
     }],
   ],
 }