Subzero. x8664. Resurrects the Target.

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import subprocess
 import sys
 import tempfile
 
 import targets
 from utils import shellcmd
@@ skipping 117 matching lines @@
             shellcmd(['{bin}/pnacl-opt'.format(bin=bindir),
                       '-pnacl-abi-simplify-preopt',
                       '-pnacl-abi-simplify-postopt',
                       '-pnaclabi-allow-debug-metadata',
                       bitcode_nonfinal, '-S', '-o', bitcode])
 
         base_sz = '{base}.{key}'.format(base=base, key=key)
         asm_sz = os.path.join(args.dir, base_sz + '.sz.s')
         obj_sz = os.path.join(args.dir, base_sz + '.sz.o')
         obj_llc = os.path.join(args.dir, base_sz + '.llc.o')
+
         shellcmd(['{path}/pnacl-sz'.format(path=os.path.dirname(mypath)),
                   ] + args.sz_args + [
                   '-O' + args.optlevel,
                   '-mattr=' + args.attr,
                   '--target=' + args.target,
                   '--sandbox=' + str(args.sandbox),
                   '--prefix=' + args.prefix,
                   '-allow-uninitialized-globals',
                   '-externalize',
                   '-filetype=' + args.filetype,
                   '-o=' + (obj_sz if args.filetype == 'obj' else asm_sz),
                   bitcode] + arch_sz_flags[args.target])
         if args.filetype != 'obj':
             shellcmd(['{bin}/llvm-mc'.format(bin=bindir),
                       '-triple=' + triple,
                       '-filetype=obj',
                       '-o=' + obj_sz,
                       asm_sz])
+
         # Each separately translated Subzero object file contains its own
         # definition of the __Sz_block_profile_info profiling symbol.  Avoid
         # linker errors (multiply defined symbol) by making all copies weak.
         # (This could also be done by Subzero if it supported weak symbol
         # definitions.)  This approach should be OK because cross tests are
         # currently the only situation where multiple translated files are
         # linked into the executable, but when PNaCl supports shared nexe
         # libraries, this would need to change.
         shellcmd(['{bin}/le32-nacl-objcopy'.format(bin=bindir),
                   '--weaken-symbol=__Sz_block_profile_info', obj_sz])
         objs.append(obj_sz)
         if args.crosstest_bitcode:
             shellcmd(['{bin}/pnacl-llc'.format(bin=bindir),
                       '-mtriple=' + triple,
                       '-externalize',
                       '-filetype=obj',
                       '-o=' + obj_llc,
                       bitcode] + llc_flags)
             objs.append(obj_llc)
         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 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')
+    # TODO(jpp): clean up stack hack related code.
+    needs_stack_hack = False
     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.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()