Finish details of newlib install

toolchain_build/toolchain_build.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """Recipes for NativeClient toolchain packages.
 
 The real entry plumbing is in toolchain_main.py.
 """
 
@@ skipping 44 matching lines @@
       '--disable-shared',
       '--prefix=',
       ]
 
 CONFIGURE_HOST_TOOL = CONFIGURE_HOST_LIB + [
     '--with-pkgversion=' + PACKAGE_NAME,
     '--with-bugurl=' + BUG_URL,
     '--without-zlib',
 ]
 
+
+def NewlibLibcScript(arch):
+  template = """/*
+ * This is a linker script that gets installed as libc.a for the
+ * newlib-based NaCl toolchain.  It brings in the constituent
+ * libraries that make up what -lc means semantically.
+ */
+OUTPUT_FORMAT(%s)
+GROUP ( libcrt_common.a libnacl.a )
+"""
+  if arch == 'arm':
+    # Listing three formats instead of one makes -EL/-EB switches work
+    # for the endian-switchable ARM backend.
+    format_list = ['elf32-littlearm-nacl',
+                   'elf32-bigarm-nacl',
+                   'elf32-littlearm-nacl']
+  else:
+    raise Exception('TODO(mcgrathr): OUTPUT_FORMAT for %s' % arch)
+  return template % ', '.join(['"' + fmt + '"' for fmt in format_list])
+
+
 def ConfigureTargetArgs(arch):
   config_target = arch + '-nacl'
   return ['--target=' + config_target, '--with-sysroot=/' + config_target]
 
+
 def CommandsInBuild(command_lines):
   return [command.Mkdir('build')] + [command.Command(cmd, cwd='build')
                                      for cmd in command_lines]
 
 def UnpackSrc(is_gzip):
   if is_gzip:
     extract = EXTRACT_STRIP_TGZ
   else:
     extract = EXTRACT_STRIP_TBZ2
   return [
@@ skipping 179 matching lines @@
                    for dirname in ['bits', 'sys', 'machine']]
   newlib_unpack.append(command.Command([
       'python',
       os.path.join('%(top_srcdir)s',
                    'src', 'trusted', 'service_runtime', 'export_header.py'),
       os.path.join('%(top_srcdir)s',
                    'src', 'trusted', 'service_runtime', 'include'),
       newlib_sys_nacl,
       ]))
 
+  def NewlibFile(subdir, name):
+    return os.path.join('%(output)s', target + '-nacl', subdir, name)
+
   libs = {
       'newlib_' + target: {
           'dependencies': lib_deps,
           'git_url': GIT_BASE_URL + '/nacl-newlib.git',
           'git_revision': GIT_REVISIONS['newlib'],
           'unpack_commands': newlib_unpack,
           'commands': TargetCommands(target, [
               CONFIGURE_CMD +
               CONFIGURE_HOST_TOOL +
               ConfigureTargetArgs(target) + [
                   '--disable-libgloss',
                   '--enable-newlib-iconv',
                   '--enable-newlib-io-long-long',
                   '--enable-newlib-io-long-double',
                   '--enable-newlib-io-c99-formats',
                   '--enable-newlib-mb',
                   'CFLAGS=-O2',
                   'CFLAGS_FOR_TARGET=' + NewlibTargetCflags(target),
                   ],
               MAKE_PARALLEL_CMD,
               MAKE_DESTDIR_CMD + ['install-strip'],
-              # TODO(mcgrathr): Needs some additional steps:
-              # rm pthread.h
-              # mv libc.a libcrt_common.a
-              # Write libc.a with linker script text.
-              ]),
+              ]) + [
+                  command.Remove(NewlibFile('include', 'pthread.h')),
+                  command.Rename(NewlibFile('lib', 'libc.a'),
+                                 NewlibFile('lib', 'libcrt_common.a')),
+                  command.WriteData(NewlibLibcScript(target),
+                                    NewlibFile('lib', 'libc.a')),
+                  ],
           },
 
       # TODO(mcgrathr): gcc_libs
       }
   return libs
 
 
 def CollectPackages(targets):
   packages = HOST_GCC_LIBS.copy()
   for target in targets:
     packages.update(HostTools(target))
     # TODO(mcgrathr): Eventually build target libraries on only one host type.
     packages.update(TargetLibs(target))
   return packages
 
 
 PACKAGES = CollectPackages(TARGET_LIST)
 
 
 if __name__ == '__main__':
   tb = toolchain_main.PackageBuilder(PACKAGES, sys.argv[1:])
   # TODO(mcgrathr): The bot ought to run some native_client tests
   # using the new toolchain, like the old x86 toolchain bots do.
   tb.Main()