Suzero. X8664. NaCl Sandboxing.

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
 from utils import shellcmd, FindBaseNaCl, get_sfi_string
 
@@ skipping 85 matching lines @@
                            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')
 
 def LinkSandbox(objs, exe, target, verbose=True):
-    assert target in ('x8632', 'arm32'), \
+    assert target in ('x8632', 'x8664', 'arm32'), \
         '-sandbox is not available for %s' % target
     nacl_root = FindBaseNaCl()
     gold = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/bin/' +
             'le32-nacl-ld.gold').format(root=nacl_root)
     target_lib_dir = {
       'arm32': 'arm',
       'x8632': 'x86-32',
+      'x8664': 'x86-64',
     }[target]
     linklib = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
                '{target_dir}/lib').format(root=nacl_root,
                                           target_dir=target_lib_dir)
     shellcmd([gold,
               '-nostdlib',
               '--no-fix-cortex-a8',
               '--eh-frame-hdr',
               '-z', 'text',
               #'-z', 'noexecstack',
@@ skipping 286 matching lines @@
                 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',
+          'x8664': 'elf32_x86_64' if not args.sandbox else 'elf_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 15 matching lines @@
 
     # 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()