Subzero: Update tests and build scripts for sandboxing.

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import re
 import subprocess
 import sys
 import tempfile
 
 from utils import shellcmd
@@ skipping 95 matching lines @@
                   '-O' + args.optlevel,
                   '-mattr=' + args.attr,
                   '--target=' + args.target,
                   '--prefix=' + args.prefix,
                   '-allow-uninitialized-globals',
                   '-filetype=' + args.filetype,
                   '-o=' + (obj_sz if args.filetype == 'obj' else asm_sz),
                   bitcode])
         if args.filetype != 'obj':
             shellcmd(['llvm-mc',
                       '-arch=' + arch_map[args.target],

[jvoung (off chromium), 2015/02/23 23:58:38]

I guess this llvm-mc invocation is always native, but might be good to adjust
the commandlines to be consistent w/ szbuild

[Jim Stichnoth, 2015/02/24 00:37:57]

Done.  (and tested by temporarily changing default filetype to asm)

                       '-filetype=obj',
                       '-o=' + obj_sz,
                       asm_sz])
         objs.append(obj_sz)
         # Each original bitcode file needs to be translated by the
         # LLVM toolchain and have its object file linked in.  There
         # are two ways to do this: explicitly use llc, or include the
         # .ll file in the link command.  It turns out that these two
         # approaches can produce different semantics on some undefined
         # bitcode behavior.  Specifically, LLVM produces different
@@ skipping 10 matching lines @@
             objs.append(arg)
         elif use_llc:
             shellcmd(['llc'
                       '-filetype=obj',
                       '-o=' + obj_llc,
                       bitcode])
             objs.append(obj_llc)
         else:
             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'))
-    objs.append((
-            '{root}/toolchain_build/src/subzero/runtime/szrt_i686.ll'
+            '{root}/toolchain_build/src/subzero/build/runtime/' +
+            'szrt_native_x8632.o'
             ).format(root=nacl_root))
     linker = 'clang' if pure_c else 'clang++'
     shellcmd([linker, '-g', '-m32', args.driver] +
              objs +
              ['-lm', '-lpthread', '-o', os.path.join(args.dir, args.output)])