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

SConstruct

 # Copyright 2008 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 17 matching lines @@
 import platform
 import re
 import sys
 import os
 from os.path import join, dirname, abspath
 from types import DictType, StringTypes
 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.
 ANDROID_TOP = os.environ.get('TOP')
 if ANDROID_TOP is None:
   ANDROID_TOP=""
 
 ANDROID_FLAGS = ['-march=armv5te',
                  '-mtune=xscale',
                  '-msoft-float',
@@ skipping 77 matching lines @@
     },
     'os:android': {
       'CPPDEFINES':   ['ANDROID', '__ARM_ARCH_5__', '__ARM_ARCH_5T__',
                        '__ARM_ARCH_5E__', '__ARM_ARCH_5TE__'],
       'CCFLAGS':      ANDROID_FLAGS,
       'WARNINGFLAGS': ['-Wall', '-Wno-unused', '-Werror=return-type',
                        '-Wstrict-aliasing=2'],
       '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']
     }
   },
   'msvc': {
     'all': {
       'DIALECTFLAGS': ['/nologo'],
       'CCFLAGS':      ['$DIALECTFLAGS', '$WARNINGFLAGS'],
       'CXXFLAGS':     ['$CCFLAGS', '/GR-', '/Gy'],
@@ skipping 34 matching lines @@
 
 
 V8_EXTRA_FLAGS = {
   'gcc': {
     'all': {
       'CXXFLAGS':     [], #['-fvisibility=hidden'],
       'WARNINGFLAGS': ['-Wall', '-Werror', '-W',
           '-Wno-unused-parameter']
     },
     'arch:arm': {
       'CPPDEFINES':   ['ARM']

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

This is now redundant and should be removed. As are the other defintions of ARM.

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

Done.

     },
     'os:win32': {
       'WARNINGFLAGS': ['-pedantic', '-Wno-long-long']
     },
     'os:linux': {
       'WARNINGFLAGS': ['-pedantic']
     },
     'os:macos': {
       'WARNINGFLAGS': ['-pedantic']
     },
@@ skipping 87 matching lines @@
       'CCFLAGS':      ANDROID_FLAGS,
       'CPPPATH':      ANDROID_INCLUDES,
       'LIBPATH':     [ANDROID_TOP + '/out/target/product/generic/obj/lib'],
       'LINKFLAGS':    ANDROID_LINKFLAGS,
       'LIBS':         ['c', 'stdc++', 'm'],
       'mode:release': {
         'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
       }
     },
     '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': {
       'CPPDEFINES': ['_HAS_EXCEPTIONS=0'],
       'LIBS': ['winmm', 'ws2_32']
     },
     'library:shared': {
       'CPPDEFINES': ['USING_V8_SHARED']
     }
   }
@@ skipping 28 matching lines @@
       'CCFLAGS':      ANDROID_FLAGS,
       'CPPPATH':      ANDROID_INCLUDES,
       'LIBPATH':     [ANDROID_TOP + '/out/target/product/generic/obj/lib'],
       'LINKFLAGS':    ANDROID_LINKFLAGS,
       'LIBS':         ['c', 'stdc++', 'm'],
       'mode:release': {
         'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
       }
     },
     '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']
     },
     'mode:debug': {
       'CCFLAGS':      ['-g', '-O0']
     },
     'prof:oprofile': {
       'LIBPATH': ['/usr/lib32', '/usr/lib32/oprofile'],
       'LIBS': ['opagent']
@@ skipping 133 matching lines @@
     'default': 'static',
     'help': 'the type of Microsoft Visual C++ runtime library to use'
   },
   'msvcltcg': {
     'values': ['on', 'off'],
     'default': 'on',
     'help': 'use Microsoft Visual C++ link-time code generation'
   },
   'wordsize': {
     'values': ['64', '32'],
-    'default': '32',   # WORDSIZE_GUESS,
+    'default': WORDSIZE_GUESS,
     'help': 'the word size'
   },
   'simulator': {
     'values': ['arm', 'none'],
     'default': 'none',
     'help': 'build with simulator'
   },
   'disassembler': {
     'values': ['on', 'off'],
     'default': 'off',
@@ skipping 39 matching lines @@
 
 def VerifyOptions(env):
   if not IsLegal(env, 'mode', ['debug', 'release']):
     return False
   if not IsLegal(env, 'sample', ["shell", "process"]):
     return False
   if env['os'] == 'win32' and env['library'] == 'shared' and env['prof'] == 'on':
     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)." %
           (name, ", ".join(option['values'])))
       Abort(message)
     if not env[name] in option['values']:
       message = ("Unknown %s value '%s'.  Possible values are (%s)." %
           (name, env[name], ", ".join(option['values'])))
       Abort(message)
 
@@ skipping 216 matching lines @@
 # version of scons.  Also, there's a bug in some revisions that
 # doesn't allow this flag to be set, so we swallow any exceptions.
 # Lovely.
 try:
   SetOption('warn', 'no-deprecated')
 except:
   pass
 
 
 Build()