Revert "Subzero. ARM32. Initial sandboxing code."

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 300 matching lines @@
             echo=args.verbose)
         shellcmd((
             '{objcopy} --globalize-symbol={start} ' +
             '--globalize-symbol=__Sz_block_profile_info {partial}'
             ).format(objcopy=objcopy, partial=obj_partial,
                      start='_start' if args.sandbox else '_user_start'),
                  echo=args.verbose)
 
     # Run the linker regardless of hybrid mode.
     if args.sandbox:
-        assert args.target in ('x8632', 'arm32'), \
+        assert args.target in ['x8632'], \
             '-sandbox is not available for %s' % args.target
-        target_lib_dir = {
-          'arm32': 'arm',
-          'x8632': 'x86-32',
-        }[args.target]
         linklib = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/translator/' +
-                   '{target_dir}/lib').format(root=nacl_root, target_dir=target_lib_dir)
+                   'x86-32/lib').format(root=nacl_root)
         shellcmd((
             '{gold} -nostdlib --no-fix-cortex-a8 --eh-frame-hdr -z text ' +
             '--build-id --entry=__pnacl_start -static ' +
             '{linklib}/crtbegin.o {partial} ' +
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_sb_{target}.o ' +
             '{linklib}/libpnacl_irt_shim_dummy.a --start-group ' +
             '{linklib}/libgcc.a {linklib}/libcrt_platform.a ' +
             '--end-group {linklib}/crtend.o --undefined=_start ' +
             '--defsym=__Sz_AbsoluteZero=0 ' +
@@ skipping 35 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()