Adjust paths for host_x86_32/bin -> bin and for switch to 64-bit.

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 107 matching lines @@
     This script uses file modification timestamps to determine whether
     llc and Subzero re-translation are needed.  It checks timestamps
     of llc, llvm2ice, 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_i686_linux \\
+      toolchain_build/toolchain_build_pnacl.py llvm_x86_64_linux \\
       --install=toolchain/linux_x86/pnacl_newlib
     """
     argparser = argparse.ArgumentParser(
         description='    ' + main.__doc__,
         formatter_class=argparse.RawTextHelpFormatter)
     AddOptionalArgs(argparser)
     argparser.add_argument('pexe', help='Finalized pexe to translate')
     args = argparser.parse_args()
     pexe = args.pexe
     exe = args.output
     ProcessPexe(args, pexe, exe)
 
 def ProcessPexe(args, pexe, exe):
     [pexe_base, ext] = os.path.splitext(pexe)
     if ext != '.pexe':
         pexe_base = pexe
     pexe_base_unescaped = pexe_base
     pexe_base = pipes.quote(pexe_base)
     pexe = pipes.quote(pexe)
 
     nacl_root = FindBaseNaCl()
     os.environ['PATH'] = (
         '{root}/toolchain/linux_x86/pnacl_newlib/bin{sep}' +
-        '{root}/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin{sep}' +
         '{path}'
         ).format(root=nacl_root, sep=os.pathsep, path=os.environ['PATH'])
     obj_llc = pexe_base + '.llc.o'
     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 = pexe_base + '.o'
     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'
         ).format(root=nacl_root)
     llcbin = (
-        '{root}/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin/llc'
+        '{root}/toolchain/linux_x86/pnacl_newlib/bin/llc'
         ).format(root=nacl_root)
     opt_level = args.optlevel
 
     if args.force or NewerThanOrNotThere(pexe, obj_llc) or \
             NewerThanOrNotThere(llcbin, obj_llc):
         opt_level_map = { 'm1':'0', '-1':'0', '0':'0', '1':'1', '2':'2' }
         shellcmd(['pnacl-translate',
                   '-ffunction-sections',
                   '-c',
                   '-arch', 'x86-32-linux',
@@ skipping 85 matching lines @@
     # Put the extra verbose printing at the end.
     if args.verbose:
         print 'PATH={path}'.format(path=os.environ['PATH'])
         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()