Subzero: Add "szbuild.py --no-sz" arg for suppressing the pnacl-sz run.

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 80 matching lines @@
     argparser.add_argument('--target', default='x8632', dest='target',
                            choices=['arm32', 'x8632'],
                            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')
 
 def main():
     """Create a hybrid translation from Subzero and llc.
 
     Takes a finalized pexe and builds a native executable as a hybrid of Subzero
     and llc translated bitcode.  Linker tricks are used to determine whether
     Subzero or llc generated symbols are used, on a per-symbol basis.
 
     By default, for every symbol, its Subzero version is used.  Subzero and llc
     symbols can be selectively enabled/disabled via regular expressions on the
@@ skipping 98 matching lines @@
                 '{objcopy} --redefine-sym _start=_user_start {obj}'
                 ).format(objcopy=objcopy, obj=obj_llc), echo=args.verbose)
         # Generate llc syms file for consistency, even though it's not used.
         shellcmd((
             '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(pnacl_sz, obj_sz)):
-        # Run pnacl-sz regardless of hybrid mode.
-        shellcmd([pnacl_sz,
-                  '-O' + opt_level,
-                  '-bitcode-format=pnacl',
-                  '-filetype=' + args.filetype,
-                  '-o', obj_sz if args.filetype == 'obj' else asm_sz,
-                  '-target=' + args.target] +
-                 (['-externalize',
-                   '-ffunction-sections',
-                   '-fdata-sections'] if hybrid else []) +
-                 (['-sandbox'] if args.sandbox else []) +
-                 (['-enable-block-profile'] if
-                      args.enable_block_profile and not args.sandbox else []) +
-                 args.sz_args +
-                 [pexe],
-                 echo=args.verbose)
+        if not args.nosz:
+            # Run pnacl-sz regardless of hybrid mode.
+            shellcmd([pnacl_sz,
+                      '-O' + opt_level,
+                      '-bitcode-format=pnacl',
+                      '-filetype=' + args.filetype,
+                      '-o', obj_sz if args.filetype == 'obj' else asm_sz,
+                      '-target=' + args.target] +
+                     (['-externalize',
+                       '-ffunction-sections',
+                       '-fdata-sections'] if hybrid else []) +
+                     (['-sandbox'] if args.sandbox else []) +
+                     (['-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',
             }[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),
@@ skipping 121 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()