Add pnacl-gcc generated code back into the callingconv test mix

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Nacl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 316 matching lines @@
 
 def PNaClForceNative(env):
   assert(env.Bit('bitcode'))
   env.Replace(OBJSUFFIX='.o',
               SHLIBSUFFIX='.so')
   env.Append(ASFLAGS=['-arch', '${TARGET_FULLARCH}'],
              CCFLAGS=['-arch', '${TARGET_FULLARCH}', '--pnacl-allow-translate'],
              LINKFLAGS=['--pnacl-allow-native'])
   env['SHLINK'] = '${LINK}'
 
+# Get an environment for a different frontend when in
+# PNaCl mode.
+def PNaClChangeFrontend(env, frontend):
+  assert(env.Bit('bitcode'))
+  assert(frontend in ('clang','dragonegg','llvmgcc'))
+
+  # This is kind of a hack.
+  alt_env = env.Clone()
+  alt_env['PNACL_FRONTEND'] = frontend
+  alt_env = alt_env.Clone(tools = ['naclsdk'])
+  return alt_env
+
+
 # Get an environment for nacl-gcc when in PNaCl mode.
 def PNaClGetNNaClEnv(env):
   assert(env.Bit('bitcode'))
   assert(not env.Bit('target_arm'))
 
   # This is kind of a hack. We clone the environment,
   # clear the bitcode bit, and then reload naclsdk.py
   native_env = env.Clone()
   native_env.ClearBits('bitcode')
   native_env = native_env.Clone(tools = ['naclsdk'])
@@ skipping 109 matching lines @@
     env: The SCons environment in question.
 
   NOTE: SCons requires the use of this name, which fails lint.
   """
 
   # make these methods to the top level scons file
   env.AddMethod(ValidateSdk)
   env.AddMethod(AddBiasForPNaCl)
   env.AddMethod(PNaClForceNative)
   env.AddMethod(PNaClGetNNaClEnv)
+  env.AddMethod(PNaClChangeFrontend)
 
   sdk_mode = SCons.Script.ARGUMENTS.get('naclsdk_mode', 'download')
 
   # Invoke the various unix tools that the NativeClient SDK resembles.
   env.Tool('g++')
   env.Tool('gcc')
   env.Tool('gnulink')
   env.Tool('ar')
   env.Tool('as')
 
@@ skipping 28 matching lines @@
   # Dependency files it produces are to be found in ${LIBPATH}.
   # It is applied recursively to those dependencies in case
   # some of them are linker scripts too.
   ldscript_scanner = SCons.Scanner.Base(
       function=ScanLinkerScript,
       skeys=['.a', '.so', '.pso'],
       path_function=SCons.Scanner.FindPathDirs('LIBPATH'),
       recursive=True
       )
   env.Append(SCANNERS=ldscript_scanner)