Subzero. ARM32. Implements sandboxing.

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import subprocess
 import sys
 import tempfile
 
 import targets
 from utils import shellcmd
@@ skipping 164 matching lines @@
         else:
             objs.append(arg)
 
     # Add szrt_sb_${target}.o or szrt_native_${target}.o.
     objs.append((
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_{sb}_' + args.target + '.o'
             ).format(root=nacl_root, sb='sb' if args.sandbox else 'native'))
     pure_c = os.path.splitext(args.driver)[1] == '.c'
 
-    # TargetX8664 is ilp32, but clang does not currently support such
+    # TargetX8664 is ilp32, but pnacl-clang does not currently support such
     # configuration. In order to run the crosstests we play nasty, dangerous
     # tricks with the stack pointer.
     needs_stack_hack = (args.target == 'x8664')
     target_params = []
     if needs_stack_hack:
       shellcmd('{bin}/clang -g -o stack_hack.x8664.{key}.o -c '
                'stack_hack.x8664.c'.format(bin=bindir, key=key))
       target_params.append('-DX8664_STACK_HACK')
       target_params.append('stack_hack.x8664.{key}.o'.format(key=key))
 
     if args.target == 'arm32':
       target_params.append('-DARM32')
       target_params.append('-static')
 
     # Set compiler to clang, clang++, pnacl-clang, or pnacl-clang++.
     compiler = '{bin}/{prefix}{cc}'.format(
         bin=bindir, prefix='pnacl-' if args.sandbox else '',
         cc='clang' if pure_c else 'clang++')
     sb_native_args = (['-O0', '--pnacl-allow-native',
-                       '-arch', target_info.target,
+                       '-arch', target_info.compiler_arch,
                        '-Wn,-defsym=__Sz_AbsoluteZero=0']
                       if args.sandbox else
                       ['-g', '-target=' + triple,
                        '-lm', '-lpthread',
                        '-Wl,--defsym=__Sz_AbsoluteZero=0'] +
                       target_info.cross_headers)
     shellcmd([compiler] + target_params + [args.driver] + objs +
              ['-o', os.path.join(args.dir, args.output)] + sb_native_args)
 
 if __name__ == '__main__':
     main()