Subzero, MIPS32: Cross-testing enabled for MIPS32

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
 from utils import FindBaseNaCl, GetObjcopyCmd, get_sfi_string, shellcmd
 
@@ skipping 168 matching lines @@
               '--undefined=_start',
               '--defsym=__Sz_AbsoluteZero=0',
               '--defsym=_begin=0',
               '-o', exe
              ], echo=verbose)
 
 def LinkNative(objs, exe, target, verbose=True):
     nacl_root = FindBaseNaCl()
     linker = {
       'arm32': '/usr/bin/arm-linux-gnueabihf-g++',
+      'mips32': '/usr/bin/mipsel-linux-gnu-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)
     }[target]
 
     extra_linker_args = {
       'arm32': ['-mcpu=cortex-a9'],
       'x8632': ['-m32'],
       'x8664': ['-mx32']
@@ skipping 91 matching lines @@
     sym_sz = pexe_base + '.sym.sz.txt'
     sym_sz_unescaped = pexe_base_unescaped + '.sym.sz.txt'
     whitelist_sz = pexe_base + '.wl.sz.txt'
     whitelist_sz_unescaped = pexe_base_unescaped + '.wl.sz.txt'
     pnacl_sz = (
         '{root}/toolchain_build/src/subzero/pnacl-sz'
         ).format(root=nacl_root)
     llcbin = '{base}/pnacl-llc'.format(base=path_addition)
     gold = '{base}/le32-nacl-ld.gold'.format(base=path_addition)
     objcopy = '{base}/{objcopy}'.format(base=path_addition,
-                                        objcopy=GetObjcopyCmd())
+                                        objcopy=GetObjcopyCmd(args.target))
     opt_level = args.optlevel
     opt_level_map = { 'm1':'0', '-1':'0', '0':'0', '1':'1', '2':'2' }
     hybrid = args.include or args.exclude
     native = not args.sandbox and not args.nonsfi
     if args.asan:
         if args.sandbox or args.nonsfi:
             print 'Can only use AddressSanitizer with a native build'
             exit(1)
         if '-fsanitize-address' not in args.sz_args:
           args.sz_args.append('-fsanitize-address')
@@ skipping 154 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()