build_nexe.py can now apply tls_edit

build/build_nexe.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.
 
 """NEXE building script
 
 This module will take a set of source files, include paths, library paths, and
 additional arguments, and use them to build.
 """
@@ skipping 250 matching lines @@
     self.name = options.name
     self.BuildCompileOptions(options.compile_flags, self.define_list)
     self.BuildLinkOptions(options.link_flags)
     self.BuildArchiveOptions()
     self.verbose = options.verbose
     self.suffix = options.suffix
     self.strip = options.strip
     self.empty = options.empty
     self.strip_all = options.strip_all
     self.strip_debug = options.strip_debug
+    self.tls_edit = options.tls_edit
     self.finalize_pexe = options.finalize_pexe and arch == 'pnacl'
     goma_config = GetGomaConfig(options.gomadir, self.osname, arch, toolname,
                                 self.is_pnacl_toolchain)
     self.gomacc = goma_config.get('gomacc', '')
     self.goma_burst = goma_config.get('burst', False)
 
     # Use unoptimized native objects for debug IRT builds for faster compiles.
     if (self.is_pnacl_toolchain
         and (self.outtype == 'nlib'
              or self.outtype == 'nexe')
@@ skipping 286 matching lines @@
         raise Error('Failed to compile %s to %s with deps %s and cmdline:\t%s'
                     '\nNeedsRebuild returned error: %s' % (
                         src, out, outd, ' '.join(cmd_line), e))
     return out
 
   def Link(self, srcs):
     """Link these objects with predetermined options and output name."""
     out = self.LinkOutputName()
     self.Log('\nLink %s' % out)
     bin_name = self.GetCXXCompiler()
-    MakeDir(os.path.dirname(out))
-    self.CleanOutput(out)
 
-    cmd_line = [bin_name, '-o', out, '-Wl,--as-needed']
+    link_out = out
+    if self.tls_edit is not None:
+      link_out = out + '.raw'
+
+    MakeDir(os.path.dirname(link_out))
+    self.CleanOutput(link_out)
+
+    cmd_line = [bin_name, '-o', link_out, '-Wl,--as-needed']
     if not self.empty:
       cmd_line += srcs
     cmd_line += self.link_options
 
-    err = self.Run(cmd_line, out)
+    err = self.Run(cmd_line, link_out)
     if err:
       raise Error('FAILED with %d: %s' % (err, ' '.join(cmd_line)))
+
+    if self.tls_edit is not None:
+      tls_edit_cmd = [self.tls_edit, link_out, out]
+      tls_edit_err = self.Run(tls_edit_cmd, out)
+      if tls_edit_err:
+        raise Error('FAILED with %d: %s' % (err, ' '.join(tls_edit_cmd)))
+
     return out
 
   # For now, only support translating a pexe, and not .o file(s)
   def Translate(self, src):
     """Translate a pexe to a nexe."""
     out = self.TranslateOutputName()
     self.Log('\nTranslate %s' % out)
     bin_name = self.GetBinName('translate')
     cmd_line = [bin_name, '-arch', self.arch, src, '-o', out]
     cmd_line += self.link_options
@@ skipping 111 matching lines @@
                     help='Strip the NEXE for debugging', action='store_true')
   parser.add_option('--strip-all', dest='strip_all', default=False,
                     help='Strip the NEXE for production', action='store_true')
   parser.add_option('--strip', dest='strip', default='',
                     help='Strip the filename')
   parser.add_option('--nonstable-pnacl', dest='finalize_pexe', default=True,
                     help='Do not finalize pnacl bitcode for ABI stability',
                     action='store_false')
   parser.add_option('--source-list', dest='source_list',
                     help='Filename to load a source list from')
+  parser.add_option('--tls-edit', dest='tls_edit', default=None,
+                    help='tls_edit location if TLS should be modified for IRT')
   parser.add_option('-a', '--arch', dest='arch',
                     help='Set target architecture')
   parser.add_option('-c', '--compile', dest='compile_only', default=False,
                     help='Compile only.', action='store_true')
   parser.add_option('-i', '--include-dirs', dest='incdirs',
                     help='Set include directories.')
   parser.add_option('-l', '--lib-dirs', dest='libdirs',
                     help='Set library directories.')
   parser.add_option('-n', '--name', dest='name',
                     help='Base path and name of the nexe.')
@@ skipping 91 matching lines @@
       shutil.copy(objs[0], options.name)
     else:
       build.Generate(objs)
     return 0
   except Error as e:
     sys.stderr.write('%s\n' % e)
     return 1
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))