| OLD | NEW |
| 1 #!/usr/bin/env python2 | 1 #!/usr/bin/env python2 |
| 2 | 2 |
| 3 import argparse | 3 import argparse |
| 4 import os | 4 import os |
| 5 import pipes | 5 import pipes |
| 6 import re | 6 import re |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 from utils import shellcmd | 9 from utils import shellcmd |
| 10 from utils import FindBaseNaCl | 10 from utils import FindBaseNaCl |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 shellcmd(( | 249 shellcmd(( |
| 250 'objcopy -w --localize-symbol="*" {partial}' | 250 'objcopy -w --localize-symbol="*" {partial}' |
| 251 ).format(partial=obj_partial), echo=args.verbose) | 251 ).format(partial=obj_partial), echo=args.verbose) |
| 252 shellcmd(( | 252 shellcmd(( |
| 253 'objcopy --globalize-symbol=_user_start {partial}' | 253 'objcopy --globalize-symbol=_user_start {partial}' |
| 254 ).format(partial=obj_partial), echo=args.verbose) | 254 ).format(partial=obj_partial), echo=args.verbose) |
| 255 shellcmd(( | 255 shellcmd(( |
| 256 'gcc -m32 {partial} -o {exe} ' + | 256 'gcc -m32 {partial} -o {exe} ' + |
| 257 # Keep the rest of this command line (except szrt.c) in sync | 257 # Keep the rest of this command line (except szrt.c) in sync |
| 258 # with RunHostLD() in pnacl-translate.py. | 258 # with RunHostLD() in pnacl-translate.py. |
| 259 '{root}/toolchain/linux_x86/pnacl_newlib/lib-x86-32-linux/' + | 259 '{root}/toolchain/linux_x86/pnacl_newlib/translator/x86-32-linux/lib/' + |
| 260 '{{unsandboxed_irt,irt_query_list}}.o ' + | 260 '{{unsandboxed_irt,irt_query_list}}.o ' + |
| 261 '{root}/toolchain_build/src/subzero/runtime/szrt.c ' + | 261 '{root}/toolchain_build/src/subzero/runtime/szrt.c ' + |
| 262 '-lpthread -lrt' | 262 '-lpthread -lrt' |
| 263 ).format(partial=obj_partial, exe=exe, root=nacl_root), | 263 ).format(partial=obj_partial, exe=exe, root=nacl_root), |
| 264 echo=args.verbose) | 264 echo=args.verbose) |
| 265 # Put the extra verbose printing at the end. | 265 # Put the extra verbose printing at the end. |
| 266 if args.verbose: | 266 if args.verbose: |
| 267 print 'PATH={path}'.format(path=os.environ['PATH']) | 267 print 'PATH={path}'.format(path=os.environ['PATH']) |
| 268 print 'include={regex}'.format(regex=re_include_str) | 268 print 'include={regex}'.format(regex=re_include_str) |
| 269 print 'exclude={regex}'.format(regex=re_exclude_str) | 269 print 'exclude={regex}'.format(regex=re_exclude_str) |
| 270 print 'default_match={dm}'.format(dm=default_match) | 270 print 'default_match={dm}'.format(dm=default_match) |
| 271 print 'Number of Subzero syms = {num}'.format(num=len(sz_syms)) | 271 print 'Number of Subzero syms = {num}'.format(num=len(sz_syms)) |
| 272 | 272 |
| 273 if __name__ == '__main__': | 273 if __name__ == '__main__': |
| 274 main() | 274 main() |
| OLD | NEW |