Subzero: Change the name llvm2ice to the more appropriate pnacl-sz.

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 103 matching lines @@
     Each --include and --exclude argument can be a regular expression or a range
     of lines in the symbol file.  Each regular expression is wrapped inside
     '^$', so if you want a substring match on 'foo', use '.*foo.*' instead.
     Ranges use python-style 'first:last' notation, so e.g. use '0:10' or ':10'
     for the first 10 lines of the file, or '1' for the second line of the file.
 
     If no --include or --exclude arguments are given, the executable is produced
     entirely using Subzero, without using llc or linker tricks.
 
     This script uses file modification timestamps to determine whether llc and
-    Subzero re-translation are needed.  It checks timestamps of llc, llvm2ice,
+    Subzero re-translation are needed.  It checks timestamps of llc, pnacl-sz,
     and the pexe against the translated object files to determine the minimal
     work necessary.  The --force option suppresses those checks and
     re-translates everything.
 
     This script augments PATH so that various PNaCl and LLVM tools can be run.
     These extra paths are within the native_client tree.  When changes are made
     to these tools, copy them this way:
       cd native_client
       toolchain_build/toolchain_build_pnacl.py llvm_x86_64_linux \\
       --install=toolchain/linux_x86/pnacl_newlib
@@ skipping 27 matching lines @@
     obj_sz = pexe_base + '.sz.o'
     asm_sz = pexe_base + '.sz.s'
     obj_llc_weak = pexe_base + '.weak.llc.o'
     obj_sz_weak = pexe_base + '.weak.sz.o'
     obj_partial = obj_sz  # overridden for hybrid mode
     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'
-    llvm2ice = (
-        '{root}/toolchain_build/src/subzero/llvm2ice'
+    pnacl_sz = (
+        '{root}/toolchain_build/src/subzero/pnacl-sz'
         ).format(root=nacl_root)
     llcbin = 'llc'
     gold = 'le32-nacl-ld.gold'
     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)):
@@ skipping 15 matching lines @@
             shellcmd((
                 'objcopy --redefine-sym _start=_user_start {obj}'
                 ).format(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(llvm2ice, obj_sz)):
-        # Run llvm2ice regardless of hybrid mode.
-        shellcmd([llvm2ice,
+        NewerThanOrNotThere(pnacl_sz, obj_sz)):
+        # Run pnacl-sz regardless of hybrid mode.
+        shellcmd([pnacl_sz,
                   '-O' + opt_level,
                   '-bitcode-format=pnacl',
                   '-filetype=' + args.filetype,
                   '-o', obj_sz if args.filetype == 'obj' else asm_sz] +
                  (['-externalize',
                    '-ffunction-sections',
                    '-fdata-sections'] if hybrid else []) +
                  (['-sandbox'] if args.sandbox else []) +
                  args.sz_args +
                  [pexe],
@@ skipping 95 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()