Subzero: Enable Non-SFI vector cross tests.

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import subprocess
 import sys
 import tempfile
 
 import targets
 from szbuild import LinkNonsfi
@@ skipping 108 matching lines @@
     for arg in args.test:
         base, ext = os.path.splitext(arg)
         if ext == '.ll':
             bitcode = arg
         else:
             # Use pnacl-clang and pnacl-opt to produce PNaCl bitcode.
             bitcode_nonfinal = os.path.join(args.dir, base + '.' + key + '.bc')
             bitcode = os.path.join(args.dir, base + '.' + key + '.pnacl.ll')
             shellcmd(['{bin}/pnacl-clang'.format(bin=bindir),
                       ('-O2' if args.clang_opt else '-O0'),
-                      get_sfi_string(args, '', '-DNONSFI', ''),
                       ('-DARM32' if args.target == 'arm32' else ''), '-c', arg,
                       '-o', bitcode_nonfinal])
             shellcmd(['{bin}/pnacl-opt'.format(bin=bindir),
                       '-pnacl-abi-simplify-preopt',
                       '-pnacl-abi-simplify-postopt',
                       '-pnaclabi-allow-debug-metadata',
                       '-strip-metadata',
                       '-strip-module-flags',
                       '-strip-debug',
                       bitcode_nonfinal, '-S', '-o', bitcode])
@@ skipping 64 matching lines @@
     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')
-    if args.nonsfi:
-      target_params.append('-DNONSFI')
 
     pure_c = os.path.splitext(args.driver)[1] == '.c'
     if not args.nonsfi:
         # Set compiler to clang, clang++, pnacl-clang, or pnacl-clang++.
         compiler = '{bin}/{prefix}{cc}'.format(
             bin=bindir, prefix=get_sfi_string(args, 'pnacl-', '', ''),
             cc='clang' if pure_c else 'clang++')
         sb_native_args = (['-O0', '--pnacl-allow-native',
                            '-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)
         return 0
 
     base, ext = os.path.splitext(args.driver)
     bitcode_nonfinal = os.path.join(args.dir, base + '.' + key + '.bc')
     bitcode = os.path.join(args.dir, base + '.' + key + '.pnacl.ll')
     asm_sz = os.path.join(args.dir, base + '.' + key + '.s')
     obj_llc = os.path.join(args.dir, base + '.' + key + '.o')
     compiler = '{bin}/{prefix}{cc}'.format(
         bin=bindir, prefix='pnacl-',
         cc='clang' if pure_c else 'clang++')
     shellcmd([compiler,
               args.driver,
-              '-DNONSFI' if args.nonsfi else '',
               '-O2',
               '-o', bitcode_nonfinal,
               '-Wl,-r'
              ])
     shellcmd(['{bin}/pnacl-opt'.format(bin=bindir),
               '-pnacl-abi-simplify-preopt',
               '-pnacl-abi-simplify-postopt',
               '-pnaclabi-allow-debug-metadata',
               '-strip-metadata',
               '-strip-module-flags',
@@ skipping 16 matching lines @@
     objs.append(obj_llc)
     if args.nonsfi:
         LinkNonsfi(objs, os.path.join(args.dir, args.output), args.target)
     elif args.sandbox:
         LinkSandbox(objs, os.path.join(args.dir, args.output), args.target)
     else:
         LinkNative(objs, os.path.join(args.dir, args.output), args.target)
 
 if __name__ == '__main__':
     main()