Merge bleeding_edge 18021:18297

tools/gyp/v8.gyp

 # Copyright 2012 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 95 matching lines @@
     },
     {
       'target_name': 'v8_snapshot',
       'type': 'static_library',
       'conditions': [
         ['want_separate_host_toolset==1', {
           'toolsets': ['host', 'target'],
           'dependencies': [
             'mksnapshot.<(v8_target_arch)#host',
             'js2c#host',
+            'generate_trig_table#host',
           ],
         }, {
           'toolsets': ['target'],
-          'dependencies': ['mksnapshot.<(v8_target_arch)', 'js2c'],
+          'dependencies': [
+            'mksnapshot.<(v8_target_arch)',
+            'js2c',
+            'generate_trig_table',
+          ],
         }],
         ['component=="shared_library"', {
           'defines': [
             'V8_SHARED',
             'BUILDING_V8_SHARED',
           ],
           'direct_dependent_settings': {
             'defines': [
               'V8_SHARED',
               'USING_V8_SHARED',
@@ skipping 52 matching lines @@
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
         '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
         '<(SHARED_INTERMEDIATE_DIR)/trig-table.cc',
         '../../src/snapshot-empty.cc',
       ],
       'conditions': [
         ['want_separate_host_toolset==1', {
           'toolsets': ['host', 'target'],
-          'dependencies': ['js2c#host'],
+          'dependencies': ['js2c#host', 'generate_trig_table#host'],
         }, {
           'toolsets': ['target'],
-          'dependencies': ['js2c'],
+          'dependencies': ['js2c', 'generate_trig_table'],
         }],
         ['component=="shared_library"', {
           'defines': [
             'BUILDING_V8_SHARED',
             'V8_SHARED',
           ],
         }],
       ]
     },
     { 'target_name': 'generate_trig_table',
       'type': 'none',
       'conditions': [
         ['want_separate_host_toolset==1', {
-          'toolsets': ['host', 'target'],
+          'toolsets': ['host'],
         }, {
           'toolsets': ['target'],
         }],
       ],
       'actions': [
         {
           'action_name': 'generate',
           'inputs': [
             '../../tools/generate-trig-table.py',
           ],
@@ skipping 72 matching lines @@
       'target_name': 'v8_base.<(v8_target_arch)',
       'type': 'static_library',
       'conditions': [
         ['want_separate_host_toolset==1', {
           'toolsets': ['host', 'target'],
           'dependencies': ['generated-lexer#host'],
         }, {
           'toolsets': ['target'],
           'dependencies': ['generated-lexer'],
         }],
-      'dependencies': [
-        'generate_trig_table',
-      ],
       'variables': {
         'optimize': 'max',
       },
       'include_dirs+': [
         '../../src',
         '../../include',
       ],
       'sources': [  ### gcmole(all) ###
         '../../src/accessors.cc',
         '../../src/accessors.h',
@@ skipping 79 matching lines @@
         '../../src/dtoa.h',
         '../../src/effects.h',
         '../../src/elements-kind.cc',
         '../../src/elements-kind.h',
         '../../src/elements.cc',
         '../../src/elements.h',
         '../../src/execution.cc',
         '../../src/execution.h',
         '../../src/extensions/externalize-string-extension.cc',
         '../../src/extensions/externalize-string-extension.h',
+        '../../src/extensions/free-buffer-extension.cc',
+        '../../src/extensions/free-buffer-extension.h',
         '../../src/extensions/gc-extension.cc',
         '../../src/extensions/gc-extension.h',
         '../../src/extensions/statistics-extension.cc',
         '../../src/extensions/statistics-extension.h',
+        '../../src/extensions/trigger-failure-extension.cc',
+        '../../src/extensions/trigger-failure-extension.h',
         '../../src/factory.cc',
         '../../src/factory.h',
         '../../src/fast-dtoa.cc',
         '../../src/fast-dtoa.h',
         '../../src/fixed-dtoa.cc',
         '../../src/fixed-dtoa.h',
         '../../src/flag-definitions.h',
         '../../src/flags.cc',
         '../../src/flags.h',
         '../../src/frames-inl.h',
@@ skipping 623 matching lines @@
           '../../src/arraybuffer.js',
           '../../src/typedarray.js',
           '../../src/macros.py',
         ],
         'experimental_library_files': [
           '../../src/macros.py',
           '../../src/symbol.js',
           '../../src/proxy.js',
           '../../src/collection.js',
           '../../src/object-observe.js',
+          '../../src/promise.js',
           '../../src/generator.js',
           '../../src/array-iterator.js',
           '../../src/harmony-string.js',
           '../../src/harmony-array.js',
           '../../src/harmony-math.js'
         ],
       },
       'actions': [
         {
           'action_name': 'js2c',
@@ skipping 110 matching lines @@
         }],
         ['v8_compress_startup_data=="bz2"', {
           'libraries': [
             '-lbz2',
           ]
         }],
       ],
     },
   ],
 }