arm: fix native compiles

tools/gyp/v8.gyp

 # Copyright 2009 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 179 matching lines @@
         'v8_base',
       ],
       'include_dirs+': [
         '../../src',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
         '../../src/snapshot-empty.cc',
       ],
       'conditions': [
         # The ARM assembler assumes the host is 32 bits, so force building

[Søren Thygesen Gjesse, 2010/01/12 08:20:41]

Shouldn't this "ARM assembler" be "ARM simulator"?

[piman, 2010/01/12 08:42:17]

assembler-arm-inl.h is the file that fails to compile if -m32 isn't on.

         # 32-bit host tools.
-        # TODO(piman): This assumes that the host is ia32 or amd64. Fixing the
-        # code would be better
-        ['target_arch=="arm" and _toolset=="host"', {
+        ['target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
           'cflags': ['-m32'],
           'ldflags': ['-m32'],
         }]
       ]
     },
     {
       'target_name': 'v8_base',
       'type': '<(library)',
       'toolsets': ['host', 'target'],
       'include_dirs+': [
@@ skipping 204 matching lines @@
             '../../src/arm/macro-assembler-arm.h',
             '../../src/arm/regexp-macro-assembler-arm.cc',
             '../../src/arm/regexp-macro-assembler-arm.h',
             '../../src/arm/register-allocator-arm.cc',
             '../../src/arm/simulator-arm.cc',
             '../../src/arm/stub-cache-arm.cc',
             '../../src/arm/virtual-frame-arm.cc',
             '../../src/arm/virtual-frame-arm.h',
           ],
           'conditions': [
             # The ARM assembler assumes the host is 32 bits, so force building

[Søren Thygesen Gjesse, 2010/01/12 08:20:41]

Ditto.

             # 32-bit host tools.
-            # TODO(piman): This assumes that the host is ia32 or amd64. Fixing
-            # the code would be better
-            ['_toolset=="host"', {
+            ['host_arch=="x64" and _toolset=="host"', {
               'cflags': ['-m32'],
               'ldflags': ['-m32'],
             }]
           ]
         }],
         ['target_arch=="ia32"', {
           'include_dirs+': [
             '../../src/ia32',
           ],
           'sources': [
@@ skipping 145 matching lines @@
       'dependencies': [
         'v8_nosnapshot',
       ],
       'include_dirs+': [
         '../../src',
       ],
       'sources': [
         '../../src/mksnapshot.cc',
       ],
       'conditions': [
         # The ARM assembler assumes the host is 32 bits, so force building

[Søren Thygesen Gjesse, 2010/01/12 08:20:41]

Ditto.

         # 32-bit host tools.
-        # TODO(piman): This assumes that the host is ia32 or amd64. Fixing
-        # the code would be better
-        ['target_arch=="arm" and _toolset=="host"', {
+        ['target_arch=="arm" and host_arch=="x64" and _toolset=="host"', {
           'cflags': ['-m32'],
           'ldflags': ['-m32'],
         }]
       ]
     },
     {
       'target_name': 'v8_shell',
       'type': 'executable',
       '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'],
         }],
       ],
     },
   ],
 }