Subzero. Misc ARM32 bugfixes.

pydir/szbuild_spec2k.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import sys
 
 import szbuild
 
 from utils import FindBaseNaCl
 
@@ skipping 15 matching lines @@
 
     argparser = argparse.ArgumentParser(description=main.__doc__)
     szbuild.AddOptionalArgs(argparser)
     argparser.add_argument('comps', nargs='*', default=components)
     args = argparser.parse_args()
     bad = set(args.comps) - set(components)
     if bad:
         print 'Unknown component{s}: '.format(s='s' if len(bad) > 1 else '') + \
             ' '.join(x for x in bad)
         sys.exit(1)
-    suffix = 'pnacl.opt.x8632' if args.sandbox else 'gcc.opt.x8632'
+    suffix = (
+        'pnacl.opt.{target}' if args.sandbox else 'gcc.opt.{target}').format(
+             target=args.target);
     for comp in args.comps:
         name = os.path.splitext(comp)[1] or comp
         if name[0] == '.':
             name = name[1:]
         szbuild.ProcessPexe(args,
                             ('{root}/tests/spec2k/{comp}/' +
                              '{name}.opt.stripped.pexe'
                              ).format(root=nacl_root, comp=comp, name=name),
                             ('{root}/tests/spec2k/{comp}/' +
                              '{name}.{suffix}'
                              ).format(root=nacl_root, comp=comp, name=name,
                                       suffix=suffix))
 
 if __name__ == '__main__':
     main()