Subzero: Change pnacl_newlib ==> pnacl_newlib_raw in scripts.

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 113 matching lines @@
     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
+      --install=toolchain/linux_x86/pnacl_newlib_raw
     """
     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()
     path_addition = (
-        '{root}/toolchain/linux_x86/pnacl_newlib/bin'
+        '{root}/toolchain/linux_x86/pnacl_newlib_raw/bin'
         ).format(root=nacl_root)
     os.environ['PATH'] = (
         '{dir}{sep}{path}'
         ).format(dir=path_addition, 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 = obj_sz  # overridden for hybrid mode
@@ skipping 112 matching lines @@
             'objcopy --globalize-symbol={start} {partial}'
             ).format(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/translator/' +
+        linklib = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
                    'x86-32/lib').format(root=nacl_root)
         shellcmd((
             '{gold} -nostdlib --no-fix-cortex-a8 --eh-frame-hdr -z text ' +
             '--build-id --entry=__pnacl_start -static ' +
             '{linklib}/crtbegin.o {partial} ' +
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_sb_x8632.o ' +
             '{linklib}/libpnacl_irt_shim_dummy.a --start-group ' +
             '{linklib}/libgcc.a {linklib}/libcrt_platform.a ' +
             '--end-group {linklib}/crtend.o --undefined=_start ' +
             '--defsym=__Sz_AbsoluteZero=0 ' +
             '-o {exe}'
             ).format(gold=gold, linklib=linklib, partial=obj_partial, exe=exe,
                      root=nacl_root),
                  echo=args.verbose)
     else:
         shellcmd((
             '{ld} -m32 {partial} -o {exe} ' +
             # Keep the rest of this command line (except szrt_native_x8632.o) in
             # sync with RunHostLD() in pnacl-translate.py.
-            '{root}/toolchain/linux_x86/pnacl_newlib/translator/x86-32-linux/' +
-            'lib/{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
+            '{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
+            'x86-32-linux/lib/' +
+            '{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_native_x8632.o -lpthread -lrt ' +
             '-Wl,--defsym=__Sz_AbsoluteZero=0'
             ).format(ld=linker, partial=obj_partial, exe=exe, root=nacl_root),
                  echo=args.verbose)
 
     # Put the extra verbose printing at the end.
     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()