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

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import subprocess
 import sys
 import tempfile
 
 import targets
 from szbuild import LinkNonsfi
-from utils import shellcmd, FindBaseNaCl, get_sfi_string
+from utils import GetObjcopyCmd, shellcmd, FindBaseNaCl, get_sfi_string

[Jim Stichnoth, 2016/03/09 22:41:13]

I would say alphabetize these, even though they weren't originally alphabetized.

[Sean Klein, 2016/03/09 22:59:22]

ASCII alphabetized (uppercase before lowercase).

 
 def main():
     """Builds a cross-test binary for comparing Subzero and llc translation.
 
     Each --test argument is compiled once by llc and once by Subzero.  C/C++
     tests are first compiled down to PNaCl bitcode using pnacl-clang and
     pnacl-opt.  The --prefix argument ensures that symbol names are different
     between the two object files, to avoid linking errors.
 
     There is also a --driver argument that specifies the C/C++ file that calls
@@ skipping 137 matching lines @@
                       asm_sz])
 
         # Each separately translated Subzero object file contains its own
         # definition of the __Sz_block_profile_info profiling symbol.  Avoid
         # linker errors (multiply defined symbol) by making all copies weak.
         # (This could also be done by Subzero if it supported weak symbol
         # definitions.)  This approach should be OK because cross tests are
         # currently the only situation where multiple translated files are
         # linked into the executable, but when PNaCl supports shared nexe
         # libraries, this would need to change.
-        shellcmd(['{bin}/le32-nacl-objcopy'.format(bin=bindir),
+        shellcmd([('{bin}/' + GetObjcopyCmd()).format(bin=bindir),
                   '--weaken-symbol=__Sz_block_profile_info',
                   '--strip-symbol=nacl_tp_tdb_offset',
                   '--strip-symbol=nacl_tp_tls_offset',
                   obj_sz])
         objs.append(obj_sz)
         shellcmd(['{bin}/pnacl-llc'.format(bin=bindir),
                   '-arm-enable-dwarf-eh=1',
                   '-mtriple=' + triple,
                   '-externalize',
                   '-filetype=obj',
                   '-bitcode-format=llvm',
                   '-o=' + obj_llc,
                   bitcode] + llc_flags)
-        shellcmd(['{bin}/le32-nacl-objcopy'.format(bin=bindir),
+        shellcmd([('{bin}/' + GetObjcopyCmd()).format(bin=bindir),
                   '--weaken-symbol=__Sz_block_profile_info',
                   '--strip-symbol=nacl_tp_tdb_offset',
                   '--strip-symbol=nacl_tp_tls_offset',
                   obj_llc])
         objs.append(obj_llc)
 
     # Add szrt_sb_${target}.o or szrt_native_${target}.o.
     if not args.nonsfi:
         objs.append((
                 '{root}/toolchain_build/src/subzero/build/runtime/' +
@@ skipping 51 matching lines @@
     shellcmd(['{bin}/pnacl-llc'.format(bin=bindir),
               '-arm-enable-dwarf-eh=1',
               '-mtriple=' + triple,
               '-externalize',
               '-filetype=obj',
               '-O2',
               '-bitcode-format=llvm',
               '-o', obj_llc,
               bitcode] + llc_flags)
     if not args.sandbox and not args.nonsfi:
-        shellcmd(['{bin}/le32-nacl-objcopy'.format(bin=bindir),
+        shellcmd([('{bin}/' + GetObjcopyCmd()).format(bin=bindir),
                   '--redefine-sym', '_start=_user_start',
                   obj_llc
                  ])
     objs.append(obj_llc)
     if args.nonsfi:
         LinkNonsfi(objs, os.path.join(args.dir, args.output), args.target)
     elif args.sandbox:
         LinkSandbox(objs, os.path.join(args.dir, args.output), args.target)
     else:
         LinkNative(objs, os.path.join(args.dir, args.output), args.target)
 
 if __name__ == '__main__':
     main()