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

site_scons/site_tools/naclsdk.py

Index: site_scons/site_tools/naclsdk.py
===================================================================
--- site_scons/site_tools/naclsdk.py	(revision 6994)
+++ site_scons/site_tools/naclsdk.py	(working copy)
@@ -334,6 +334,19 @@
              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'))
@@ -463,6 +476,7 @@
   env.AddMethod(AddBiasForPNaCl)
   env.AddMethod(PNaClForceNative)
   env.AddMethod(PNaClGetNNaClEnv)
+  env.AddMethod(PNaClChangeFrontend)
 
   sdk_mode = SCons.Script.ARGUMENTS.get('naclsdk_mode', 'download')