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
 from utils import FindBaseNaCl
 
 if __name__ == '__main__':
     """Builds a cross-test binary that allows functions translated by
     Subzero and llc to be compared.
 
     Each --test argument is compiled once by llc and once by Subzero.
     C/C++ tests are first compiled down to PNaCl bitcode by the
     build-pnacl-ir.py script.  The --prefix argument ensures that
     symbol names are different between the two object files, to avoid
     linking errors.
 
     There is also a --driver argument that specifies the C/C++ file
     that calls the test functions with a variety of interesting inputs
     and compares their results.
     """
-    # arch_map maps a Subzero target string to an llvm-mc -arch string.
-    arch_map = { 'x8632':'x86', 'x8664':'x86-64', 'arm':'arm' }
+    # arch_map maps a Subzero target string to an llvm-mc -triple string.
+    arch_map = { 'x8632':'i686', 'x8664':'x86_64', 'arm':'armv7a' }
     desc = 'Build a cross-test that compares Subzero and llc translation.'
     argparser = argparse.ArgumentParser(description=desc)
     argparser.add_argument('--test', required=True, action='append',
                            metavar='TESTFILE_LIST',
                            help='List of C/C++/.ll files with test functions')
     argparser.add_argument('--driver', required=True,
                            metavar='DRIVER',
                            help='Driver program')
     argparser.add_argument('--target', required=False, default='x8632',
                            choices=arch_map.keys(),
@@ skipping 67 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],
+                      '-triple=' + arch_map[args.target],
                       '-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)])