Subzero. x8664. Resurrects the Target.

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
 from utils import shellcmd
 from utils import FindBaseNaCl
@@ skipping 71 matching lines @@
                                 ' Default %(default)s.')
     argparser.add_argument('--filetype', default='iasm', dest='filetype',
                            choices=['obj', 'asm', 'iasm'],
                            help='Output file type.  Default %(default)s.')
     argparser.add_argument('--sandbox', dest='sandbox', action='store_true',
                            help='Enable sandboxing in the translator')
     argparser.add_argument('--enable-block-profile',
                            dest='enable_block_profile', action='store_true',
                            help='Enable basic block profiling.')
     argparser.add_argument('--target', default='x8632', dest='target',
-                           choices=['arm32', 'x8632'],
+                           choices=['arm32', 'x8632', 'x8664'],
                            help='Generate code for specified target.')
     argparser.add_argument('--verbose', '-v', dest='verbose',
                            action='store_true',
                            help='Display some extra debugging output')
     argparser.add_argument('--sz', dest='sz_args', action='append', default=[],
                            help='Extra arguments for Subzero')
     argparser.add_argument('--llc', dest='llc_args', action='append',
                            default=[], help='Extra arguments for llc')
     argparser.add_argument('--no-sz', dest='nosz', action='store_true',
                            help='Run only post-Subzero build steps')
@@ skipping 80 matching lines @@
     opt_level = args.optlevel
     opt_level_map = { 'm1':'0', '-1':'0', '0':'0', '1':'1', '2':'2' }
     hybrid = args.include or args.exclude
 
     if hybrid and (args.force or
                    NewerThanOrNotThere(pexe, obj_llc) or
                    NewerThanOrNotThere(llcbin, obj_llc)):
         arch = {
           'arm32': 'armv7' if args.sandbox else 'arm-nonsfi',
           'x8632': 'x86-32' if args.sandbox else 'x86-32-linux',
+          'x8664': 'x86-64' if args.sandbox else 'x86-64-linux',
         }[args.target]
 
         # Only run pnacl-translate in hybrid mode.
         shellcmd(['{base}/pnacl-translate'.format(base=path_addition),
                   '-split-module=1',
                   '-ffunction-sections',
                   '-fdata-sections',
                   '-c',
                   '-arch',  arch,
                   '-O' + opt_level_map[opt_level],
@@ skipping 30 matching lines @@
                      (['-enable-block-profile'] if
                           args.enable_block_profile and not args.sandbox
                           else []) +
                      args.sz_args +
                      [pexe],
                      echo=args.verbose)
         if args.filetype != 'obj':
             triple = {
               'arm32': 'arm-nacl' if args.sandbox else 'arm',
               'x8632': 'i686-nacl' if args.sandbox else 'i686',
+              'x8664': 'x86_64-nacl' if args.sandbox else 'x86_64-linux-gnux32',
             }[args.target]
 
             shellcmd((
                 '{base}/llvm-mc -triple={triple} -filetype=obj -o {obj} {asm}'
                 ).format(base=path_addition, asm=asm_sz, obj=obj_sz,
                          triple=triple),
                      echo=args.verbose)
         if not args.sandbox:
             shellcmd((
                 '{objcopy} --redefine-sym _start=_user_start {obj}'
@@ skipping 35 matching lines @@
                      echo=args.verbose)
         else:
             shellcmd((
                 '{objcopy} {obj} {weak}'
                 ).format(objcopy=objcopy, obj=obj_llc, weak=obj_llc_weak),
                 echo=args.verbose)
         obj_partial = pexe_base + '.o'
         ld = {
           'arm32': 'arm-linux-gnueabihf-ld',
           'x8632': 'ld',
+          'x8664': 'ld',
         }[args.target]
         emulation = {
           'arm32': 'armelf_linux_eabi',
           'x8632': 'elf_i386',
+          'x8664': 'elf32_x86_64',
         }[args.target]
         shellcmd((
             '{ld} -r -m {emulation} -o {partial} {sz} {llc}'
             ).format(ld=ld, emulation=emulation, partial=obj_partial,
                      sz=obj_sz_weak, llc=obj_llc_weak),
                  echo=args.verbose)
         shellcmd((
             '{objcopy} -w --localize-symbol="*" {partial}'
             ).format(objcopy=objcopy, partial=obj_partial),
             echo=args.verbose)
@@ skipping 26 matching lines @@
             '--end-group {linklib}/crtend.o --undefined=_start ' +
             '--defsym=__Sz_AbsoluteZero=0 ' +
             '-o {exe}'
             ).format(gold=gold, linklib=linklib, partial=obj_partial, exe=exe,
                      root=nacl_root, target=args.target),
                  echo=args.verbose)
     else:
         linker = {
           'arm32': '/usr/bin/arm-linux-gnueabihf-g++',
           'x8632': ('{root}/../third_party/llvm-build/Release+Asserts/bin/clang'
+                   ).format(root=nacl_root),
+          'x8664': ('{root}/../third_party/llvm-build/Release+Asserts/bin/clang'
                    ).format(root=nacl_root)
         }[args.target]
 
         extra_linker_args = ' '.join({
           'arm32': ['-mcpu=cortex-a9'],
-          'x8632': ['-m32']
+          'x8632': ['-m32'],
+          'x8664': ['-mx32']
         }[args.target])
 
         lib_dir = {
           'arm32': 'arm-linux',
           'x8632': 'x86-32-linux',
+          'x8664': 'x86-64-linux',
         }[args.target]
 
         shellcmd((
             '{ld} {ld_extra_args} {partial} -o {exe} ' +
             # Keep the rest of this command line (except szrt_native_x8632.o) in
             # sync with RunHostLD() in pnacl-translate.py.
             '{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
             '{lib_dir}/lib/' +
             '{{unsandboxed_irt,irt_random,irt_query_list}}.o ' +
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_native_{target}.o -lpthread -lrt ' +
             '-Wl,--defsym=__Sz_AbsoluteZero=0'
             ).format(ld=linker, ld_extra_args=extra_linker_args,
                      partial=obj_partial, exe=exe, root=nacl_root,
                      target=args.target, lib_dir=lib_dir),
                  echo=args.verbose)
 
     # Put the extra verbose printing at the end.
     if args.verbose and hybrid:
         print 'include={regex}'.format(regex=re_include_str)
         print 'exclude={regex}'.format(regex=re_exclude_str)
         print 'default_match={dm}'.format(dm=default_match)
         print 'Number of Subzero syms = {num}'.format(num=len(sz_syms))
 
 if __name__ == '__main__':
     main()