A64: Synchronize with r16249.

tools/gyp/v8.gyp

Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 30e645c85a11bfcf3a86241df22c1da15b06752c..86cfba5a9467a221f5634ee9c0423d7e1d136b38 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -380,6 +380,8 @@
         '../../src/hydrogen-uint32-analysis.h',
         '../../src/hydrogen-osr.cc',
         '../../src/hydrogen-osr.h',
+        '../../src/i18n.cc',
+        '../../src/i18n.h',
         '../../src/icu_util.cc',
         '../../src/icu_util.h',
         '../../src/ic-inl.h',
@@ -734,6 +736,10 @@
                 }],
               ],
             },
+            'defines': [
+              'V8_OS_LINUX=1',
+              'V8_OS_POSIX=1'
+            ],
             'sources': [  ### gcmole(os:linux) ###
               '../../src/platform-linux.cc',
               '../../src/platform-posix.cc'
@@ -751,16 +757,29 @@
               ['host_os=="mac"', {
                 'target_conditions': [
                   ['_toolset=="host"', {
+                    'defines': [
+                      'V8_OS_BSD=1',
+                      'V8_OS_MACOSX=1',
+                      'V8_OS_POSIX=1'
+                    ],
                     'sources': [
                       '../../src/platform-macos.cc'
                     ]
                   }, {
+                    'defines': [
+                      'V8_OS_LINUX=1',
+                      'V8_OS_POSIX=1'
+                    ],
                     'sources': [
                       '../../src/platform-linux.cc'
                     ]
                   }],
                 ],
               }, {
+                'defines': [
+                  'V8_OS_LINUX=1',
+                  'V8_OS_POSIX=1'
+                ],
                 'sources': [
                   '../../src/platform-linux.cc'
                 ]
@@ -769,6 +788,11 @@
           },
         ],
         ['OS=="freebsd"', {
+            'defines': [
+              'V8_OS_BSD=1',
+              'V8_OS_FREEBSD=1',
+              'V8_OS_POSIX=1'
+            ],
             'link_settings': {
               'libraries': [
                 '-L/usr/local/lib -lexecinfo',
@@ -780,6 +804,11 @@
           }
         ],
         ['OS=="openbsd"', {
+            'defines': [
+              'V8_OS_BSD=1',
+              'V8_OS_OPENBSD=1',
+              'V8_OS_POSIX=1'
+            ],
             'link_settings': {
               'libraries': [
                 '-L/usr/local/lib -lexecinfo',
@@ -791,6 +820,11 @@
           }
         ],
         ['OS=="netbsd"', {
+            'defines': [
+              'V8_OS_BSD=1',
+              'V8_OS_NETBSD=1',
+              'V8_OS_POSIX=1'
+            ],
             'link_settings': {
               'libraries': [
                 '-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lexecinfo',
@@ -802,6 +836,10 @@
           }
         ],
         ['OS=="solaris"', {
+            'defines': [
+              'V8_OS_POSIX=1',
+              'V8_OS_SOLARIS=1'
+            ],
             'link_settings': {
               'libraries': [
                 '-lsocket -lnsl',
@@ -813,6 +851,11 @@
           }
         ],
         ['OS=="mac"', {
+          'defines': [
+            'V8_OS_BSD=1',
+            'V8_OS_MACOSX=1',
+            'V8_OS_POSIX=1'
+          ],
           'sources': [
             '../../src/platform-macos.cc',
             '../../src/platform-posix.cc'
@@ -829,11 +872,18 @@
               },
               'conditions': [
                 ['build_env=="Cygwin"', {
+                  'defines': [
+                    'V8_OS_CYGWIN=1',
+                    'V8_OS_POSIX=1'
+                  ],
                   'sources': [
                     '../../src/platform-cygwin.cc',
                     '../../src/platform-posix.cc',
                   ],
                 }, {
+                  'defines': [
+                    'V8_OS_WIN=1'
+                  ],
                   'sources': [
                     '../../src/platform-win32.cc',
                     '../../src/win32-math.h',
@@ -845,6 +895,9 @@
                 'libraries': [ '-lwinmm', '-lws2_32' ],
               },
             }, {
+              'defines': [
+                'V8_OS_WIN=1'
+              ],
               'sources': [
                 '../../src/platform-win32.cc',
                 '../../src/win32-math.h',
@@ -870,21 +923,18 @@
         }],
         ['v8_enable_i18n_support==1', {
           'sources': [
-            '../../src/i18n.cc',
-            '../../src/i18n.h',
-            '../../src/extensions/i18n/break-iterator.cc',
-            '../../src/extensions/i18n/break-iterator.h',
-            '../../src/extensions/i18n/collator.cc',
-            '../../src/extensions/i18n/collator.h',
             '../../src/extensions/i18n/i18n-extension.cc',
             '../../src/extensions/i18n/i18n-extension.h',
-            '../../src/extensions/i18n/i18n-utils.cc',
-            '../../src/extensions/i18n/i18n-utils.h',
           ],
           'dependencies': [
             '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
             '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
           ]
+        }, {  # v8_enable_i18n_support==0
+          'sources!': [
+            '../../src/i18n.cc',
+            '../../src/i18n.h',
+          ],
         }],
         ['OS=="win" and v8_enable_i18n_support==1', {
           'dependencies': [
@@ -939,6 +989,8 @@
           '../../src/date.js',
           '../../src/json.js',
           '../../src/regexp.js',
+          '../../src/arraybuffer.js',
+          '../../src/typedarray.js',
           '../../src/macros.py',
         ],
         'experimental_library_files': [
@@ -947,8 +999,6 @@
           '../../src/proxy.js',
           '../../src/collection.js',
           '../../src/object-observe.js',
-          '../../src/arraybuffer.js',
-          '../../src/typedarray.js',
           '../../src/generator.js',
           '../../src/array-iterator.js',
           '../../src/harmony-string.js',