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

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import re
 import subprocess
 import sys
 import tempfile
 
 from utils import shellcmd
@@ skipping 50 matching lines @@
                                 ' Default "%(default)s".')
     argparser.add_argument('--crosstest-bitcode', required=False,
                            default=1, type=int,
                            help='Compile non-subzero crosstest object file ' +
                            'from the same bitcode as the subzero object. ' +
                            'If 0, then compile it straight from source.' +
                            ' Default %(default)d.')
     args = argparser.parse_args()
 
     nacl_root = FindBaseNaCl()
-    # Prepend host_x86_32/bin to $PATH.
+    # Prepend PNaCl bin to $PATH.
     os.environ['PATH'] = nacl_root + \
-        '/toolchain/linux_x86/pnacl_newlib/host_x86_32/bin' + \
+        '/toolchain/linux_x86/pnacl_newlib/bin' + \
         os.pathsep + os.environ['PATH']
 
     objs = []
     remove_internal = re.compile('^define internal ')
     fix_target = re.compile('le32-unknown-nacl')
     for arg in args.test:
         base, ext = os.path.splitext(arg)
         if ext == '.ll':
             bitcode = arg
         else:
@@ skipping 56 matching lines @@
             objs.append(bitcode)
 
     # Use 'clang szrt.c'  -or-  'clang++ szrt.cpp'
     objs.append((
             '{root}/toolchain_build/src/subzero/runtime/szrt.{ext}'
             ).format(root=nacl_root, ext='c' if pure_c else 'cpp'))
     linker = 'clang' if pure_c else 'clang++'
     shellcmd([linker, '-g', '-m32', args.driver] +
              objs +
              ['-lm', '-lpthread', '-o', os.path.join(args.dir, args.output)])