- Simplify the architecture setup. In particular the 'wordsize' parameter...

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 131 matching lines @@
       'CXXFLAGS':     ['-DWIN32'],
     },
     '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': {
-      'arch:x64': {
-        'CCFLAGS':      ['-m64'],
-        'LINKFLAGS':    ['-m64']
-      }
-    },
-    'wordsize:64': {
-      'arch:ia32': {
-        'CCFLAGS':      ['-m32'],
-        'LINKFLAGS':    ['-m32']
-      },
-      'arch:arm': {
-        'CCFLAGS':      ['-m32'],
-        'LINKFLAGS':    ['-m32']
-      }
-    },
     'arch:ia32': {
-      'CPPDEFINES':   ['V8_TARGET_ARCH_IA32']
+      'CPPDEFINES':   ['V8_TARGET_ARCH_IA32'],
+      'CCFLAGS':      ['-m32'],
+      'LINKFLAGS':    ['-m32']
     },
     'arch:arm': {
       'CPPDEFINES':   ['V8_TARGET_ARCH_ARM']
     },
+    'simulator:arm': {
+      'CCFLAGS':      ['-m32'],
+      'LINKFLAGS':    ['-m32']
+    },
     'arch:x64': {
-      'CCFLAGS':      ['-fno-strict-aliasing'],
-      'CPPDEFINES':   ['V8_TARGET_ARCH_X64']
+      'CPPDEFINES':   ['V8_TARGET_ARCH_X64'],
+      'CCFLAGS':      ['-fno-strict-aliasing', '-m64'],
+      'LINKFLAGS':    ['-m64'],
     },
     'prof:oprofile': {
       'CPPDEFINES':   ['ENABLE_OPROFILE_AGENT']
     }
   },
   'msvc': {
     'all': {
       'DIALECTFLAGS': ['/nologo'],
       'CCFLAGS':      ['$DIALECTFLAGS', '$WARNINGFLAGS'],
       'CXXFLAGS':     ['$CCFLAGS', '/GR-', '/Gy'],
@@ skipping 147 matching lines @@
                        '__ARM_ARCH_5E__', '__ARM_ARCH_5TE__'],
       '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': {
-      'arch:x64': {
-        'CCFLAGS':      ['-m64'],
-        'LINKFLAGS':    ['-m64']
-      }
-    },
-    'wordsize:64': {
-      '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']
     },
     'arch:ia32': {
@@ skipping 31 matching lines @@
                        '__ARM_ARCH_5E__', '__ARM_ARCH_5TE__'],
       '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': {
-      'arch:x64': {
-        'CCFLAGS':      ['-m64'],
-        'LINKFLAGS':    ['-m64']
-      }
+    'arch:ia32': {
+      'CCFLAGS':      ['-m32'],
+      'LINKFLAGS':    ['-m32']
     },
-    'wordsize:64': {
-      'arch:ia32': {
-        'CCFLAGS':      ['-m32'],
-        'LINKFLAGS':    ['-m32']
-      },
-      'arch:arm': {
-        'CCFLAGS':      ['-m32'],
-        'LINKFLAGS':    ['-m32']
-      }
+    'arch:x64': {
+      'CCFLAGS':      ['-m64'],
+      'LINKFLAGS':    ['-m64']
+    },
+    'simulator: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 90 matching lines @@
     return 'gcc'
   elif 'msvc' in tools:
     return 'msvc'
   else:
     return None
 
 
 OS_GUESS = utils.GuessOS()
 TOOLCHAIN_GUESS = GuessToolchain(OS_GUESS)
 ARCH_GUESS = utils.GuessArchitecture()
-WORDSIZE_GUESS = utils.GuessWordsize()
 
 
 SIMPLE_OPTIONS = {
   'toolchain': {
     'values': ['gcc', 'msvc'],
     'default': TOOLCHAIN_GUESS,
     'help': 'the toolchain to use (' + TOOLCHAIN_GUESS + ')'
   },
   'os': {
     'values': ['freebsd', 'linux', 'macos', 'win32', 'android'],
@@ skipping 33 matching lines @@
   'msvcrt': {
     'values': ['static', 'shared'],
     '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': WORDSIZE_GUESS,
-    'help': 'the word size'
-  },
   'simulator': {
     'values': ['arm', 'none'],
     'default': 'none',
     'help': 'build with simulator'
   },
   'disassembler': {
     'values': ['on', 'off'],
     'default': 'off',
     'help': 'enable the disassembler to inspect generated code'
   },
@@ skipping 334 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()