Change startup ABI for untrusted code to be C-compatible

SConstruct

 # -*- 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.
 
 import atexit
 import glob
 import os
 import platform
 import stat
@@ skipping 3068 matching lines @@
 # we do it separately for each after making nacl_irt_env and
 # clearing its Bit('nacl_glibc').
 def AddImplicitLibs(env):
   if not env.Bit('nacl_glibc'):
     # These are automatically linked in by the compiler, either directly
     # or via the linker script that is -lc.  In the non-glibc build, we
     # are the ones providing these files, so we need dependencies.
     # The ComponentProgram method (site_scons/site_tools/component_builders.py)
     # adds dependencies on env['IMPLICIT_LIBS'] if that's set.
     implicit_libs = ['crt1.o', 'libnacl.a', 'libcrt_platform.a']
+    # TODO(mcgrathr): multilib nonsense defeats -B!  figure out a better way.
+    if GetPlatform('targetplatform') == 'x86-32':
+      implicit_libs.append(os.path.join('32', 'crt1.o'))
     if env.Bit('bitcode'):
       implicit_libs += ['libehsupport.a']
     else:
       implicit_libs += ['crti.o', 'crtn.o']
-    env['IMPLICIT_LIBS'] = ['${LIB_DIR}/%s' % file for file in implicit_libs]
+    env['IMPLICIT_LIBS'] = [env.File(os.path.join('${LIB_DIR}', file))
+                            for file in implicit_libs]
     # The -B<dir>/ flag is necessary to tell gcc to look for crt[1in].o there.
     env.Prepend(LINKFLAGS=['-B${LIB_DIR}/'])
 
 AddImplicitLibs(nacl_env)
 AddImplicitLibs(nacl_irt_env)
 
 # Give the environment for building the IRT and its libraries
 # the -Ds used for building those libraries for the SDK.
 # TODO(mcgrathr,bradnelson): clean up when nacl_extra_sdk_env goes away.
 #
@@ skipping 233 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')