Change startup ABI for untrusted code to be C-compatible

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 259 matching lines @@
               CC=GetEnvOrDummy('CC'),
               CXX=GetEnvOrDummy('CXX'),
               AR=GetEnvOrDummy('AR'),
               # NOTE: use g++ for linking so we can handle c AND c++
               LINK=GetEnvOrDummy('LINK'),
               RANLIB=GetEnvOrDummy('RANLIB'),
               )
 
 def PNaClForceNative(env):
   assert(env.Bit('bitcode'))
-  env.Replace(OBJSUFFIX='.o')
-  env.Replace(SHLIBSUFFIX='.so')
-  env.Append(CCFLAGS=['-arch', '${TARGET_FULLARCH}',
-                            '--pnacl-allow-translate'])
-  env.Append(LINKFLAGS=['--pnacl-allow-native'])
+  env.Replace(OBJSUFFIX='.o',
+              SHLIBSUFFIX='.so')
+  env.Append(ASFLAGS=['-arch', '${TARGET_FULLARCH}'],
+             CCFLAGS=['-arch', '${TARGET_FULLARCH}', '--pnacl-allow-translate'],
+             LINKFLAGS=['--pnacl-allow-native'])
 
 # 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')
@@ skipping 103 matching lines @@
     # if bitcode=1 use pnacl toolchain
     if env.Bit('bitcode'):
       _SetEnvForPnacl(env, root)
     elif env.Bit('target_x86'):
       _SetEnvForX86Sdk(env, root)
     else:
       print "ERROR: unknown TARGET_ARCHITECTURE: ", env['TARGET_ARCHITECTURE']
       assert 0
 
   env.Prepend(LIBPATH='${NACL_SDK_LIB}')