Periodic merge of bleeding_edge to experimental code generator branch....

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 36 matching lines @@
       'CXXFLAGS':     ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'],
       'LIBS':         ['pthread']
     },
     'mode:debug': {
       'CCFLAGS':      ['-g', '-O0'],
       'CPPDEFINES':   ['ENABLE_DISASSEMBLER', 'DEBUG']
     },
     'mode:release': {
       'CCFLAGS':      ['-O3', '-fomit-frame-pointer']
     },
+    'os:freebsd': {
+      'LIBS':         ['execinfo']
+    },
     'wordsize:64': {
       'CCFLAGS':      ['-m32'],
       'LINKFLAGS':    ['-m32']
     }
   },
   'msvc': {
     'all': {
       'DIALECTFLAGS': ['/nologo'],
       'CCFLAGS':      ['$DIALECTFLAGS', '$WARNINGFLAGS'],
       'CXXFLAGS':     ['$CCFLAGS', '/GR-', '/Gy'],
       'CPPDEFINES':   ['WIN32', '_USE_32BIT_TIME_T', 'PCRE_STATIC'],
       'LINKFLAGS':    ['/NOLOGO', '/MACHINE:X86', '/INCREMENTAL:NO',
           '/NXCOMPAT', '/IGNORE:4221'],
       'ARFLAGS':      ['/NOLOGO'],
       'CCPDBFLAGS':   ['/Zi']
     },
     'mode:debug': {
-      'CCFLAGS':      ['/Od', '/Gm', '/MTd'],
+      'CCFLAGS':      ['/Od', '/Gm'],
       'CPPDEFINES':   ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'],
-      'LINKFLAGS':    ['/DEBUG']
+      'LINKFLAGS':    ['/DEBUG'],
+      'msvcrt:static': {
+        'CCFLAGS': ['/MTd']
+      },
+      'msvcrt:shared': {
+        'CCFLAGS': ['/MDd']
+      }
     },
     'mode:release': {
-      'CCFLAGS':      ['/O2', '/MT', '/GL'],
+      'CCFLAGS':      ['/O2', '/GL'],
       'LINKFLAGS':    ['/OPT:REF', '/OPT:ICF', '/LTCG'],
-      'ARFLAGS':      ['/LTCG']
-    }
+      'ARFLAGS':      ['/LTCG'],
+      'msvcrt:static': {
+        'CCFLAGS': ['/MT']
+      },
+      'msvcrt:shared': {
+        'CCFLAGS': ['/MD']
+      }
+    },
   }
 }
 
 
 V8_EXTRA_FLAGS = {
   'gcc': {
     'all': {
       'CXXFLAGS':     [], #['-fvisibility=hidden'],
       'WARNINGFLAGS': ['-pedantic', '-Wall', '-Werror', '-W',
           '-Wno-unused-parameter']
@@ skipping 86 matching lines @@
 SAMPLE_FLAGS = {
   'all': {
     'CPPPATH': [join(abspath('.'), 'include')],
     'LIBS': ['$LIBRARY'],
   },
   'gcc': {
     'all': {
       'LIBS': ['pthread'],
       'LIBPATH': ['.']
     },
+    'os:freebsd': {
+      'LIBS':         ['execinfo']
+    },
     'wordsize:64': {
       'CCFLAGS':      ['-m32'],
       'LINKFLAGS':    ['-m32']
     },
     'mode:release': {
       'CCFLAGS':      ['-O2']
     },
     'mode:debug': {
       'CCFLAGS':      ['-g', '-O0']
     }
   },
   'msvc': {
     'all': {
       'CCFLAGS': ['/nologo'],
       'LINKFLAGS': ['/nologo'],
     },
     'library:shared': {
       'CPPDEFINES': ['USING_V8_SHARED']
     },
     'prof:on': {
       'LINKFLAGS': ['/MAP']
     },
     'mode:release': {
-      'CCFLAGS':   ['/O2', '/MT'],
-      'LINKFLAGS': ['/OPT:REF', '/OPT:ICF', '/LTCG']
+      'CCFLAGS':   ['/O2'],
+      'LINKFLAGS': ['/OPT:REF', '/OPT:ICF', '/LTCG'],
+      'msvcrt:static': {
+        'CCFLAGS': ['/MT']
+      },
+      'msvcrt:shared': {
+        'CCFLAGS': ['/MD']
+      }
     },
     'mode:debug': {
-      'CCFLAGS':   ['/Od', '/MTd'],
-      'LINKFLAGS': ['/DEBUG']
+      'CCFLAGS':   ['/Od'],
+      'LINKFLAGS': ['/DEBUG'],
+      'msvcrt:static': {
+        'CCFLAGS': ['/MTd']
+      },
+      'msvcrt:shared': {
+        'CCFLAGS': ['/MDd']
+      }
     }
   }
 }
 
 
 D8_FLAGS = {
   'gcc': {
     'console:readline': {
       'LIBS': ['readline']
     }
   },
-  'msvc': { }
 }
 
 
 SUFFIXES = {
   'release': '',
   'debug': '_g'
 }
 
 
 def Abort(message):
@@ skipping 17 matching lines @@
 WORDSIZE_GUESS = utils.GuessWordsize()
 
 
 SIMPLE_OPTIONS = {
   'toolchain': {
     'values': ['gcc', 'msvc'],
     'default': TOOLCHAIN_GUESS,
     'help': 'the toolchain to use'
   },
   'os': {
-    'values': ['linux', 'macos', 'win32'],
+    'values': ['freebsd', 'linux', 'macos', 'win32'],
     'default': OS_GUESS,
     'help': 'the os to build for'
   },
   'arch': {
     'values':['arm', 'ia32'],
     'default': ARCH_GUESS,
     'help': 'the architecture to build for'
   },
   'snapshot': {
     'values': ['on', 'off'],
     'default': 'off',
     'help': 'build using snapshots for faster start-up'
   },
   'prof': {
     'values': ['on', 'off'],
     'default': 'off',
     'help': 'enable profiling of build target'
   },
   'library': {
     'values': ['static', 'shared'],
     'default': 'static',
     'help': 'the type of library to produce'
   },
+  'msvcrt': {
+    'values': ['static', 'shared'],
+    'default': 'static',
+    'help': 'the type of MSVCRT library to use'
+  },
   'wordsize': {
     'values': ['64', '32'],
     'default': WORDSIZE_GUESS,
     'help': 'the word size'
   },
   'simulator': {
     'values': ['arm', 'none'],
     'default': 'none',
     'help': 'build with simulator'
   },
@@ skipping 67 matching lines @@
     self.options = options
     self.env_overrides = env_overrides
     self.samples = samples
     self.use_snapshot = (options['snapshot'] == 'on')
     self.flags = None
 
   def AddRelevantFlags(self, initial, flags):
     result = initial.copy()
     self.AppendFlags(result, flags.get('all'))
     toolchain = self.options['toolchain']
-    self.AppendFlags(result, flags[toolchain].get('all'))
+    if toolchain in flags:
+      self.AppendFlags(result, flags[toolchain].get('all'))
+      for option in sorted(self.options.keys()):
+        value = self.options[option]
+        self.AppendFlags(result, flags[toolchain].get(option + ':' + value))
+    return result
+
+  def AddRelevantSubFlags(self, options, flags):
+    self.AppendFlags(options, flags.get('all'))
     for option in sorted(self.options.keys()):
       value = self.options[option]
-      self.AppendFlags(result, flags[toolchain].get(option + ':' + value))
-    return result
+      self.AppendFlags(options, flags.get(option + ':' + value))
 
   def GetRelevantSources(self, source):
     result = []
     result += source.get('all', [])
     for (name, value) in self.options.iteritems():
       result += source.get(name + ':' + value, [])
     return sorted(result)
 
   def AppendFlags(self, options, added):
     if not added:
       return
     for (key, value) in added.iteritems():
-      if not key in options:
-        options[key] = value
+      if key.find(':') != -1:
+        self.AddRelevantSubFlags(options, { key: value })
       else:
-        prefix = options[key]
-        if isinstance(prefix, StringTypes): prefix = prefix.split()
-        options[key] = prefix + value
+        if not key in options:
+          options[key] = value
+        else:
+          prefix = options[key]
+          if isinstance(prefix, StringTypes): prefix = prefix.split()
+          options[key] = prefix + value
 
   def ConfigureObject(self, env, input, **kw):
     if self.options['library'] == 'static':
       return env.StaticObject(input, **kw)
     else:
       return env.SharedObject(input, **kw)
 
   def ApplyEnvOverrides(self, env):
     if not self.env_overrides:
       return
@@ skipping 123 matching lines @@
     context = BuildSpecific(env.Copy(), mode, env_overrides)
     libraries += context.library_targets
     cctests += context.cctest_targets
     samples += context.sample_targets
     d8s += context.d8_targets
 
   env.Alias('library', libraries)
   env.Alias('cctests', cctests)
   env.Alias('sample', samples)
   env.Alias('d8', d8s)
-  
+
   if env['sample']:
     env.Default('sample')
   else:
     env.Default('library')
 
 
 # We disable deprecation warnings because we need to be able to use
 # env.Copy without getting warnings for compatibility with older
 # 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()