Subzero: Add a --elf arg to szbuild.py and crosstest.py.

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 62 matching lines @@
                            help='Subzero symbols to exclude ' +
                                 '(regex or line range)')
     argparser.add_argument('--output', '-o', default='a.out', dest='output',
                            action='store',
                            help='Output executable. Default %(default)s.')
     argparser.add_argument('-O', default='2', dest='optlevel',
                            choices=['m1', '-1', '0', '1', '2'],
                            help='Optimization level ' +
                                 '(m1 and -1 are equivalent).' +
                                 ' Default %(default)s.')
+    argparser.add_argument('--elf', dest='elf',
+                           action='store_true',
+                           help='Directly generate ELF output')
     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')
 
 def main():
     """Create a hybrid translation from Subzero and llc.
@@ skipping 102 matching lines @@
             'nm {obj} | sed -n "s/.* [a-zA-Z] //p" > {sym}'
             ).format(obj=obj_llc, sym=sym_llc), echo=args.verbose)
 
     if (args.force or
         NewerThanOrNotThere(pexe, obj_sz) or
         NewerThanOrNotThere(llvm2ice, obj_sz)):
         # Run llvm2ice regardless of hybrid mode.
         shellcmd([llvm2ice,
                   '-O' + opt_level,
                   '-bitcode-format=pnacl',
-                  '-o', asm_sz] +
+                  '-o', obj_sz if args.elf else asm_sz] +
                  (['-externalize',
                    '-ffunction-sections',
                    '-fdata-sections'] if hybrid else []) +
+                 (['-elf-writer'] if args.elf else []) +
                  args.sz_args +
                  [pexe],
                  echo=args.verbose)
-        shellcmd((
-            'llvm-mc -arch=x86 -filetype=obj -o {obj} {asm}'
-            ).format(asm=asm_sz, obj=obj_sz), echo=args.verbose)
+        if not args.elf:
+            shellcmd((
+                'llvm-mc -arch=x86 -filetype=obj -o {obj} {asm}'
+                ).format(asm=asm_sz, obj=obj_sz), echo=args.verbose)
         shellcmd((
             'objcopy --redefine-sym _start=_user_start {obj}'
             ).format(obj=obj_sz), echo=args.verbose)
         if hybrid:
             shellcmd((
                 'nm {obj} | sed -n "s/.* [a-zA-Z] //p" > {sym}'
                 ).format(obj=obj_sz, sym=sym_sz), echo=args.verbose)
 
     if hybrid:
         with open(sym_sz_unescaped) as f:
@@ skipping 60 matching lines @@
     if args.verbose:
         print 'PATH={path}'.format(path=os.environ['PATH'])
         if 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()