Roll NaCl toolchain change.

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 152 matching lines @@
     buildbot_common.ErrorExit('Unknown architecture %s.' % arch)
   return os.path.join(tcpath, 'translator', arch, 'lib')
 
 
 def BuildStepDownloadToolchains(toolchains):
   buildbot_common.BuildStep('Running package_version.py')
   args = [sys.executable, PKGVER, '--mode', 'nacl_core_sdk']
   if 'bionic' in toolchains:
     build_platform = '%s_x86' % getos.GetPlatform()
     args.extend(['--append', os.path.join(build_platform, 'nacl_arm_bionic')])
-  args.append('sync')
+  args.extend(['sync', '--extract'])
   buildbot_common.Run(args, cwd=NACL_DIR)
 
 
 def BuildStepCleanPepperDirs(pepperdir, pepperdir_old):
   buildbot_common.BuildStep('Clean Pepper Dirs')
   buildbot_common.RemoveDir(pepperdir_old)
   buildbot_common.RemoveDir(pepperdir)
   buildbot_common.MakeDir(pepperdir)
 
 
@@ skipping 152 matching lines @@
     # ones
     tc_name = 'newlib'
 
   InstallFiles(SRC_DIR, tc_dst_inc, NACL_HEADER_MAP[tc_name])
 
 
 def MakeNinjaRelPath(path):
   return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), path)
 
 
+# TODO(ncbray): stop building and copying libraries into the SDK that are
+# already provided by the toolchain.
 TOOLCHAIN_LIBS = {
   'bionic' : [
     'libminidump_generator.a',
     'libnacl_dyncode.a',
     'libnacl_exception.a',
     'libnacl_list_mappings.a',
     'libppapi.a',
   ],
   'newlib' : [
-    'crti.o',
-    'crtn.o',
     'libminidump_generator.a',
     'libnacl.a',
     'libnacl_dyncode.a',
     'libnacl_exception.a',
     'libnacl_list_mappings.a',
     'libnosys.a',
     'libppapi.a',
     'libppapi_stub.a',
     'libpthread.a',
   ],
@@ skipping 90 matching lines @@
     for xarch in xarches:
       src_dir = GetGypBuiltLib(tc, xarch)
       dst_dir = GetOutputToolchainLib(pepperdir, tc, xarch)
       InstallFiles(src_dir, dst_dir, TOOLCHAIN_LIBS[tc])
 
       # Copy ARM newlib components to bionic
       if tc == 'newlib' and xarch == 'arm' and 'bionic' in toolchains:
         bionic_dir = GetOutputToolchainLib(pepperdir, 'bionic', xarch)
         InstallFiles(src_dir, bionic_dir, TOOLCHAIN_LIBS['bionic'])
 
-      if tc != 'pnacl':
-        src_dir = GetGypToolchainLib(tc, xarch)
-        InstallFiles(src_dir, dst_dir, ['crt1.o'])
-
 
 def GypNinjaBuild_NaCl(rel_out_dir):
   # TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only
   # can use VS2010, not VS2013 which is now required by the Chromium repo. NaCl
   # needs to be updated to perform the same logic as Chromium in detecting VS,
   # which can now exist in the depot_tools directory.
   # See https://code.google.com/p/nativeclient/issues/detail?id=4022
   #
   # For now, let's use gyp_chromium to build these components.
 #  gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
@@ skipping 622 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')