Eliminate all uses of 'le32-nacl-objcopy'.

pydir/build-runtime.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import shutil
 import tempfile
 
 import targets
+from utils import GetObjcopyCmd

[Jim Stichnoth, 2016/03/09 23:15:24]

Maybe put these 3 on a single sorted line like the other place?

[Sean Klein, 2016/03/09 23:20:20]

Done.

 from utils import shellcmd
 from utils import FindBaseNaCl
 
 
 def Translate(ll_files, extra_args, obj, verbose):
   """Translate a set of input bitcode files into a single object file.
 
   Use pnacl-llc to translate textual bitcode input ll_files into object file
   obj, using extra_args as the architectural flags.
   """
   shellcmd(['cat'] + ll_files + ['|',
             'pnacl-llc',
             '-externalize',
             '-function-sections',
             '-O2',
             '-filetype=obj',
             '-bitcode-format=llvm',
             '-arm-enable-dwarf-eh=1',
             '-o', obj
     ] + extra_args, echo=verbose)
-  shellcmd(['le32-nacl-objcopy',
+  shellcmd([GetObjcopyCmd(),
             '--strip-symbol=nacl_tp_tdb_offset',
             '--strip-symbol=nacl_tp_tls_offset',
             obj
     ], echo=verbose)
 
 
 def PartialLink(obj_files, extra_args, lib, verbose):
   """Partially links a set of obj files into a final obj library."""
   shellcmd(['le32-nacl-ld',
             '-o', lib,
@@ skipping 35 matching lines @@
               '{srcdir}/szrt_asm_{target}.s'.format(
                 srcdir=srcdir, target=target_info.target)
       ], echo=verbose)
     # Write full szrt_native_{target}.o.
     PartialLink([TmpFile('{dir}/szrt_native_{target}.tmp.o'),
                  TmpFile('{dir}/szrt_native_asm_{target}.o'),
                  TmpFile('{dir}/szrt_native_profiler_{target}.o')],
                 ['-m {ld_emu}'.format(ld_emu=target_info.ld_emu)],
                 OutFile('{rtdir}/szrt_native_{target}.o'),
                 verbose)
-    shellcmd(['le32-nacl-objcopy',
+    shellcmd([GetObjcopyCmd(),
               '--strip-symbol=NATIVE',
               OutFile('{rtdir}/szrt_native_{target}.o')])
 
   # Helper function for building the sandboxed runtime.
   def MakeSandboxedRuntime():
     """Builds just the sandboxed runtime."""
     # Translate tempdir/szrt.ll and tempdir/szrt_ll.ll to szrt_sb_{target}.o.
     # The sandboxed library does not get the profiler helper function as the
     # binaries are linked with -nostdlib.
     Translate(ll_files,
               ['-mtriple=' + targets.ConvertTripleToNaCl(target_info.triple)] +
               target_info.llc_flags,
               TmpFile('{dir}/szrt_sb_{target}.tmp.o'),
               verbose)
     # Assemble srcdir/szrt_asm_{target}.s to tempdir/szrt_asm_{target}.o.
     shellcmd(['llvm-mc',
               '-triple=' + targets.ConvertTripleToNaCl(target_info.triple),
               '--defsym NACL=1',
               '-filetype=obj',
               '-o', TmpFile('{dir}/szrt_sb_asm_{target}.o'),
               '{srcdir}/szrt_asm_{target}.s'.format(
                 srcdir=srcdir, target=target_info.target)
       ], echo=verbose)
     PartialLink([TmpFile('{dir}/szrt_sb_{target}.tmp.o'),
                  TmpFile('{dir}/szrt_sb_asm_{target}.o')],
                 ['-m {ld_emu}'.format(ld_emu=target_info.sb_emu)],
                 OutFile('{rtdir}/szrt_sb_{target}.o'),
                 verbose)
-    shellcmd(['le32-nacl-objcopy',
+    shellcmd([GetObjcopyCmd(),
               '--strip-symbol=NACL',
               OutFile('{rtdir}/szrt_sb_{target}.o')])
 
   # Helper function for building the Non-SFI runtime.
   def MakeNonsfiRuntime():
     """Builds just the nonsfi runtime."""
     # Translate tempdir/szrt.ll and tempdir/szrt_ll.ll to
     # szrt_nonsfi_{target}.tmp.o.
     Translate(ll_files,
               ['-mtriple=' + target_info.triple] + target_info.llc_flags +
               ['-relocation-model=pic', '-force-tls-non-pic', '-malign-double'],
               TmpFile('{dir}/szrt_nonsfi_{target}.tmp.o'),
               verbose)
     # Assemble srcdir/szrt_asm_{target}.s to tempdir/szrt_asm_{target}.o.
     shellcmd(['llvm-mc',
               '-triple=' + target_info.triple, '--defsym NONSFI=1',
               '-filetype=obj',
               '-o', TmpFile('{dir}/szrt_nonsfi_asm_{target}.o'),
               '{srcdir}/szrt_asm_{target}.s'.format(
                 srcdir=srcdir, target=target_info.target)
       ], echo=verbose)
     # Write full szrt_nonsfi_{target}.o.
     PartialLink([TmpFile('{dir}/szrt_nonsfi_{target}.tmp.o'),
                  TmpFile('{dir}/szrt_nonsfi_asm_{target}.o')],
                 ['-m {ld_emu}'.format(ld_emu=target_info.ld_emu)],
                 OutFile('{rtdir}/szrt_nonsfi_{target}.o'),
                 verbose)
-    shellcmd(['le32-nacl-objcopy',
+    shellcmd([GetObjcopyCmd(),
               '--strip-symbol=NONSFI',
               OutFile('{rtdir}/szrt_nonsfi_{target}.o')])
 
 
   # Run the helper functions.
   MakeNativeRuntime()
   MakeSandboxedRuntime()
   MakeNonsfiRuntime()
 
 
@@ skipping 54 matching lines @@
 
     finally:
         try:
             shutil.rmtree(tempdir)
         except OSError as exc:
             if exc.errno != errno.ENOENT: # ENOENT - no such file or directory
                 raise # re-raise exception
 
 if __name__ == '__main__':
     main()