Merge revision 8894 from 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 94 matching lines @@
                       'CAN_USE_VFP_INSTRUCTIONS',
                     ],
                     'cflags': [
                       '-mfloat-abi=hard',
                     ],
                   }, {
                     'defines': [
                       'USE_EABI_HARDFLOAT=0',
                     ],
                   }],
-                  # The ARM assembler assumes the host is 32 bits,
-                  # so force building 32-bit host tools.
-                  [ 'host_arch=="x64" and _toolset=="host"', {
-                    'cflags': ['-m32'],
-                    'ldflags': ['-m32'],
-                  }],
                 ],
               }],
               ['v8_target_arch=="ia32"', {
                 'defines': [
                   'V8_TARGET_ARCH_IA32',
                 ],
               }],
               ['v8_target_arch=="x64"', {
                 'defines': [
                   'V8_TARGET_ARCH_X64',
@@ skipping 185 matching lines @@
           'target_name': 'v8_snapshot',
           'type': '<(library)',
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
               'dependencies': ['mksnapshot#host', 'js2c#host'],
             }, {
               'toolsets': ['target'],
               'dependencies': ['mksnapshot', 'js2c'],
             }],
+            # 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'],
+            }],
             ['component=="shared_library"', {
               'conditions': [
                 ['OS=="win"', {
                   'defines': [
                     'BUILDING_V8_SHARED',
                   ],
                   'direct_dependent_settings': {
                     'defines': [
                       'USING_V8_SHARED',
                     ],
@@ skipping 83 matching lines @@
           ],
           'include_dirs+': [
             '../../src',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
             '../../src/snapshot-empty.cc',
           ],
           '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'],
+            }],
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
               'dependencies': ['js2c#host'],
             }, {
               'toolsets': ['target'],
               'dependencies': ['js2c'],
             }],
             ['component=="shared_library"', {
               'defines': [
                 'BUILDING_V8_SHARED',
@@ skipping 291 matching lines @@
                 '../../src/arm/lithium-codegen-arm.h',
                 '../../src/arm/lithium-gap-resolver-arm.cc',
                 '../../src/arm/lithium-gap-resolver-arm.h',
                 '../../src/arm/macro-assembler-arm.cc',
                 '../../src/arm/macro-assembler-arm.h',
                 '../../src/arm/regexp-macro-assembler-arm.cc',
                 '../../src/arm/regexp-macro-assembler-arm.h',
                 '../../src/arm/simulator-arm.cc',
                 '../../src/arm/stub-cache-arm.cc',
               ],
+              'conditions': [
+                # The ARM assembler assumes the host is 32 bits,
+                # so force building 32-bit host tools.
+                ['host_arch=="x64" and _toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }],
+              ],
             }],
             ['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', {
               'sources': [
                 '../../src/ia32/assembler-ia32-inl.h',
                 '../../src/ia32/assembler-ia32.cc',
                 '../../src/ia32/assembler-ia32.h',
                 '../../src/ia32/builtins-ia32.cc',
                 '../../src/ia32/code-stubs-ia32.cc',
                 '../../src/ia32/code-stubs-ia32.h',
                 '../../src/ia32/codegen-ia32.cc',
@@ skipping 218 matching lines @@
           ],
           'sources': [
             '../../src/mksnapshot.cc',
           ],
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host'],
             }, {
               'toolsets': ['target'],
             }],
+            # 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',
               ]}],
           ]
         },
         {
           'target_name': 'v8_shell',
           'type': 'executable',
           'dependencies': [
@@ skipping 45 matching lines @@
       'targets': [
         {
           'target_name': 'v8',
           'type': 'settings',
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }, {
               'toolsets': ['target'],
             }],
-
+            # 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'],
+            }],
           ],
           'link_settings': {
             'libraries': [
               '-lv8',
             ],
           },
         },
         {
           'target_name': 'v8_shell',
           'type': 'none',
           'conditions': [
             ['want_separate_host_toolset==1', {
               'toolsets': ['host'],
             }, {
               'toolsets': ['target'],
             }],
           ],
           'dependencies': [
             'v8'
           ],
         },
       ],
     }],
   ],
 }