Fix .gyp file and avoid adding -m32 on 32 bit systems.

SConstruct

Index: SConstruct
diff --git a/SConstruct b/SConstruct
index d8ef914ca6dcafe663bae5ef7a7e90f9f56164b1..4365aa8a169d0676e253fc6d6090bfec2e1c653a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -35,6 +35,7 @@ root_dir = dirname(File('SConstruct').rfile().abspath)
 sys.path.append(join(root_dir, 'tools'))
 import js2c, utils
 
+
 # ANDROID_TOP is the top of the Android checkout, fetched from the environment
 # variable 'TOP'.   You will also need to set the CXX, CC, AR and RANLIB
 # environment variables to the cross-compiling tools.
@@ -132,23 +133,29 @@ LIBRARY_FLAGS = {
       'CPPPATH':      ANDROID_INCLUDES,
     },
     'wordsize:32': {
-      'CCFLAGS':      ['-m32'],
-      'CPPDEFINES':   ['ILP32'],
-      'LINKFLAGS':    ['-m32']
+      'arch:x64': {
+        'CCFLAGS':      ['-m64'],
+        'LINKFLAGS':    ['-m64']
+      }
     },
     'wordsize:64': {
-      'CCFLAGS':      ['-m64'],
-      'CPPDEFINES':   ['LP64'],
-      'LINKFLAGS':    ['-m64']
+      'arch:ia32': {
+        'CCFLAGS':      ['-m32'],
+        'LINKFLAGS':    ['-m32']
+      },
+      'arch:arm': {
+        'CCFLAGS':      ['-m32'],
+        'LINKFLAGS':    ['-m32']
+      }
     },
     'arch:ia32': {
-      'CPPDEFINES':   ['V8_ARCH_IA32']
+      'CPPDEFINES':   ['V8_ARCH_IA32', 'ILP32']
     },
     'arch:arm': {
-      'CPPDEFINES':   ['V8_ARCH_ARM']
+      'CPPDEFINES':   ['V8_ARCH_ARM', 'ILP32']
     },
     'arch:x64': {
-      'CPPDEFINES':   ['V8_ARCH_X64']
+      'CPPDEFINES':   ['V8_ARCH_X64', 'LP64']

[iposva, 2009/04/29 21:30:31]

Shouldn't you rely on __LP64__ being defined by the compiler?

Also as a note of warning Windows 64-bit uses (LL)P64, so while we are bringing
this up we should take care to not use long to mean 64-bit values, but use a
sized type such as int64_t.

Actually thinking about this second point, I think it illustrates well that you
should not define LP64 here because it will be wrong on certain architectures.

Same for ILP32, I don't think it should be defined in the build files.

[Lasse Reichstein, 2009/05/01 06:36:29]

Personally, I prefer setting everything myself to depending on the compiler.
It is exactly because of Windows using LLPC64 that we are going to need to
differentiate, and I much prefer being in control to relying on some property
that might differ between compilers.

If not all GCC compilers use LP64 as 64-bit data model, then these declarations
should be fixed. The ones I am aware of should do so. The setting for the MSVC
compiler should be in another sub-section (and hasn't been added yet).

I.e., it was deliberate, but I'm open to arguments for other approaches.

     },
     'prof:oprofile': {
       'CPPDEFINES':   ['ENABLE_OPROFILE_AGENT']
@@ -311,15 +318,21 @@ CCTEST_EXTRA_FLAGS = {
       }
     },
     'wordsize:32': {
-      'CCFLAGS':      ['-m32'],
-      'CPPDEFINES':   ['ILP32'],
-      'LINKFLAGS':    ['-m32']
+      'arch:x64': {
+        'CCFLAGS':      ['-m64'],
+        'LINKFLAGS':    ['-m64']
+      }
     },
     'wordsize:64': {
-      'CCFLAGS':      ['-m64'],
-      'CPPDEFINES':   ['LP64'],
-      'LINKFLAGS':    ['-m64']
-    },
+      'arch:ia32': {
+        'CCFLAGS':      ['-m32'],
+        'LINKFLAGS':    ['-m32']
+      },
+      'arch:arm': {
+        'CCFLAGS':      ['-m32'],
+        'LINKFLAGS':    ['-m32']
+      }
+    }
   },
   'msvc': {
     'all': {
@@ -368,14 +381,20 @@ SAMPLE_FLAGS = {
       }
     },
     'wordsize:32': {
-      'CCFLAGS':      ['-m32'],
-      'CPPDEFINES':   ['ILP32'],
-      'LINKFLAGS':    ['-m32']
+      'arch:x64': {
+        'CCFLAGS':      ['-m64'],
+        'LINKFLAGS':    ['-m64']
+      }
     },
     'wordsize:64': {
-      'CCFLAGS':      ['-m64'],
-      'CPPDEFINES':   ['LP64'],
-      'LINKFLAGS':    ['-m64']
+      'arch:ia32': {
+        'CCFLAGS':      ['-m32'],
+        'LINKFLAGS':    ['-m32']
+      },
+      'arch:arm': {
+        'CCFLAGS':      ['-m32'],
+        'LINKFLAGS':    ['-m32']
+      }
     },
     'mode:release': {
       'CCFLAGS':      ['-O2']
@@ -529,7 +548,7 @@ SIMPLE_OPTIONS = {
   },
   'wordsize': {
     'values': ['64', '32'],
-    'default': '32',   # WORDSIZE_GUESS,
+    'default': WORDSIZE_GUESS,
     'help': 'the word size'
   },
   'simulator': {
@@ -589,8 +608,8 @@ def VerifyOptions(env):
     Abort("Profiling on windows only supported for static library.")
   if env['prof'] == 'oprofile' and env['os'] != 'linux':
     Abort("OProfile is only supported on Linux.")
-  if env['wordsize'] == '64' and (env['os'] != 'linux' or env['arch'] != 'x64'):
-    Abort("64 bit compilation only allowed on Linux OS and x64 architecture.")
+  if env['arch'] == 'x64' and env['os'] != 'linux':
+    Abort("X64 compilation only allowed on Linux OS.")

[iposva, 2009/04/29 21:30:31]

Why? The Mac has a perfectly fine working x64 environment. And it would be nice
to be able to test on a secondary platform occasionally.

[Lasse Reichstein, 2009/05/01 06:36:29]

Yes, there is probably no reason for this restriction anyway. We don't guarantee
that it compiles anyway, yet. I didn't remove it before committing, but it
should be removed when there's an occasion.

   for (name, option) in SIMPLE_OPTIONS.iteritems():
     if (not option.get('default')) and (name not in ARGUMENTS):
       message = ("A value for option %s must be specified (%s)." %