arm: fix native compiles

tools/gyp/v8.gyp

Index: tools/gyp/v8.gyp
===================================================================
--- tools/gyp/v8.gyp	(revision 3577)
+++ tools/gyp/v8.gyp	(working copy)
@@ -199,9 +199,7 @@
       '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'],
         }]
@@ -428,9 +426,7 @@
           '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'],
             }]
@@ -598,9 +594,7 @@
       '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'],
         }]