Build ARM SZ runtime files. Use le32-nacl-objcopy in various places.

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
 from utils import shellcmd
 from utils import FindBaseNaCl
@@ skipping 159 matching lines @@
     sym_llc = pexe_base + '.sym.llc.txt'
     sym_sz = pexe_base + '.sym.sz.txt'
     sym_sz_unescaped = pexe_base_unescaped + '.sym.sz.txt'
     whitelist_sz = pexe_base + '.wl.sz.txt'
     whitelist_sz_unescaped = pexe_base_unescaped + '.wl.sz.txt'
     pnacl_sz = (
         '{root}/toolchain_build/src/subzero/pnacl-sz'
         ).format(root=nacl_root)
     llcbin = '{base}/pnacl-llc'.format(base=path_addition)
     gold = 'le32-nacl-ld.gold'
+    objcopy = 'le32-nacl-objcopy'
     opt_level = args.optlevel
     opt_level_map = { 'm1':'0', '-1':'0', '0':'0', '1':'1', '2':'2' }
     hybrid = args.include or args.exclude
 
     if hybrid and (args.force or
                    NewerThanOrNotThere(pexe, obj_llc) or
                    NewerThanOrNotThere(llcbin, obj_llc)):
         # Only run pnacl-translate in hybrid mode.
         shellcmd(['pnacl-translate',
                   '-split-module=1',
                   '-ffunction-sections',
                   '-fdata-sections',
                   '-c',
                   '-arch', 'x86-32' if args.sandbox else 'x86-32-linux',
                   '-O' + opt_level_map[opt_level],
                   '--pnacl-driver-append-LLC_FLAGS_EXTRA=-externalize',
                   '-o', obj_llc] +
                  (['--pnacl-driver-verbose'] if args.verbose else []) +
                  args.llc_args +
                  [pexe],
                  echo=args.verbose)
         if not args.sandbox:
             shellcmd((
-                'objcopy --redefine-sym _start=_user_start {obj}'
-                ).format(obj=obj_llc), echo=args.verbose)
+                '{objcopy} --redefine-sym _start=_user_start {obj}'
+                ).format(objcopy=objcopy, obj=obj_llc), echo=args.verbose)
         # Generate llc syms file for consistency, even though it's not used.
         shellcmd((
             'nm {obj} | sed -n "s/.* [a-zA-Z] //p" > {sym}'
             ).format(obj=obj_llc, sym=sym_llc), echo=args.verbose)
 
     if (args.force or
         NewerThanOrNotThere(pexe, obj_sz) or
         NewerThanOrNotThere(pnacl_sz, obj_sz)):
         # Run pnacl-sz regardless of hybrid mode.
         shellcmd([pnacl_sz,
@@ skipping 11 matching lines @@
                  [pexe],
                  echo=args.verbose)
         if args.filetype != 'obj':
             shellcmd((
                 'llvm-mc -triple={triple} -filetype=obj -o {obj} {asm}'
                 ).format(asm=asm_sz, obj=obj_sz,
                          triple='i686-nacl' if args.sandbox else 'i686'),
                      echo=args.verbose)
         if not args.sandbox:
             shellcmd((
-                'objcopy --redefine-sym _start=_user_start {obj}'
-                ).format(obj=obj_sz), echo=args.verbose)
+                '{objcopy} --redefine-sym _start=_user_start {obj}'
+                ).format(objcopy=objcopy, obj=obj_sz), echo=args.verbose)
         if hybrid:
             shellcmd((
                 'nm {obj} | sed -n "s/.* [a-zA-Z] //p" > {sym}'
                 ).format(obj=obj_sz, sym=sym_sz), echo=args.verbose)
 
     if hybrid:
         with open(sym_sz_unescaped) as f:
             sz_syms = f.read().splitlines()
         re_include_str = BuildRegex(args.include, sz_syms)
         re_exclude_str = BuildRegex(args.exclude, sz_syms)
         re_include = re.compile(re_include_str)
         re_exclude = re.compile(re_exclude_str)
         # If a symbol doesn't explicitly match re_include or re_exclude,
         # the default MatchSymbol() result is True, unless some --include
         # args are provided.
         default_match = not args.include
 
         whitelist_has_items = False
         with open(whitelist_sz_unescaped, 'w') as f:
             for sym in sz_syms:
                 if MatchSymbol(sym, re_include, re_exclude, default_match):
                     f.write(sym + '\n')
                     whitelist_has_items = True
         shellcmd((
-            'objcopy --weaken {obj} {weak}'
-            ).format(obj=obj_sz, weak=obj_sz_weak), echo=args.verbose)
+            '{objcopy} --weaken {obj} {weak}'
+            ).format(objcopy=objcopy, obj=obj_sz, weak=obj_sz_weak),
+            echo=args.verbose)
         if whitelist_has_items:
             # objcopy returns an error if the --weaken-symbols file is empty.
             shellcmd((
-                'objcopy --weaken-symbols={whitelist} {obj} {weak}'
-                ).format(whitelist=whitelist_sz, obj=obj_llc,
+                '{objcopy} --weaken-symbols={whitelist} {obj} {weak}'
+                ).format(objcopy=objcopy,
+                         whitelist=whitelist_sz, obj=obj_llc,
                          weak=obj_llc_weak),
                      echo=args.verbose)
         else:
             shellcmd((
-                'objcopy {obj} {weak}'
-                ).format(obj=obj_llc, weak=obj_llc_weak), echo=args.verbose)
+                '{objcopy} {obj} {weak}'
+                ).format(objcopy=objcopy, obj=obj_llc, weak=obj_llc_weak),
+                echo=args.verbose)
         obj_partial = pexe_base + '.o'
         shellcmd((
             'ld -r -m elf_i386 -o {partial} {sz} {llc}'
             ).format(partial=obj_partial, sz=obj_sz_weak, llc=obj_llc_weak),
                  echo=args.verbose)
         shellcmd((
-            'objcopy -w --localize-symbol="*" {partial}'
-            ).format(partial=obj_partial), echo=args.verbose)
+            '{objcopy} -w --localize-symbol="*" {partial}'
+            ).format(objcopy=objcopy, partial=obj_partial),
+            echo=args.verbose)
         shellcmd((
-            'objcopy --globalize-symbol={start} {partial}'
-            ).format(partial=obj_partial,
+            '{objcopy} --globalize-symbol={start} {partial}'
+            ).format(objcopy=objcopy, partial=obj_partial,
                      start='_start' if args.sandbox else '_user_start'),
                  echo=args.verbose)
 
     # Run the linker regardless of hybrid mode.
     linker = (
         '{root}/../third_party/llvm-build/Release+Asserts/bin/clang'
         ).format(root=nacl_root)
     if args.sandbox:
         linklib = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
                    'x86-32/lib').format(root=nacl_root)
@@ skipping 29 matching lines @@
     if args.verbose:
         print 'PATH: {path}'.format(path=path_addition)
         if hybrid:
             print 'include={regex}'.format(regex=re_include_str)
             print 'exclude={regex}'.format(regex=re_exclude_str)
             print 'default_match={dm}'.format(dm=default_match)
             print 'Number of Subzero syms = {num}'.format(num=len(sz_syms))
 
 if __name__ == '__main__':
     main()