| 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 subprocess | 5 import subprocess |
| 6 import sys | 6 import sys |
| 7 import tempfile | 7 import tempfile |
| 8 | 8 |
| 9 from utils import shellcmd | 9 from utils import shellcmd |
| 10 from utils import FindBaseNaCl | 10 from utils import FindBaseNaCl |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 help='Compile non-subzero crosstest object file ' + | 65 help='Compile non-subzero crosstest object file ' + |
| 66 'from the same bitcode as the subzero object. ' + | 66 'from the same bitcode as the subzero object. ' + |
| 67 'If 0, then compile it straight from source.' + | 67 'If 0, then compile it straight from source.' + |
| 68 ' Default %(default)d.') | 68 ' Default %(default)d.') |
| 69 argparser.add_argument('--filetype', default='obj', dest='filetype', | 69 argparser.add_argument('--filetype', default='obj', dest='filetype', |
| 70 choices=['obj', 'asm', 'iasm'], | 70 choices=['obj', 'asm', 'iasm'], |
| 71 help='Output file type. Default %(default)s.') | 71 help='Output file type. Default %(default)s.') |
| 72 args = argparser.parse_args() | 72 args = argparser.parse_args() |
| 73 | 73 |
| 74 nacl_root = FindBaseNaCl() | 74 nacl_root = FindBaseNaCl() |
| 75 bindir = ('{root}/toolchain/linux_x86/pnacl_newlib/bin' | 75 bindir = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/bin' |
| 76 .format(root=nacl_root)) | 76 .format(root=nacl_root)) |
| 77 triple = arch_map[args.target] + ('-nacl' if args.sandbox else '') | 77 triple = arch_map[args.target] + ('-nacl' if args.sandbox else '') |
| 78 mypath = os.path.abspath(os.path.dirname(sys.argv[0])) | 78 mypath = os.path.abspath(os.path.dirname(sys.argv[0])) |
| 79 | 79 |
| 80 objs = [] | 80 objs = [] |
| 81 for arg in args.test: | 81 for arg in args.test: |
| 82 # Construct a "unique key" for each test so that tests can be run in | 82 # Construct a "unique key" for each test so that tests can be run in |
| 83 # parallel without race conditions on temporary file creation. | 83 # parallel without race conditions on temporary file creation. |
| 84 key = '{target}.{sb}.O{opt}.{attr}'.format( | 84 key = '{target}.{sb}.O{opt}.{attr}'.format( |
| 85 target=args.target, sb='sb' if args.sandbox else 'nat', | 85 target=args.target, sb='sb' if args.sandbox else 'nat', |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 sb_native_args = (['-O0', '--pnacl-allow-native', '-arch', 'x8632', | 149 sb_native_args = (['-O0', '--pnacl-allow-native', '-arch', 'x8632', |
| 150 '-Wn,-defsym=__Sz_AbsoluteZero=0'] | 150 '-Wn,-defsym=__Sz_AbsoluteZero=0'] |
| 151 if args.sandbox else | 151 if args.sandbox else |
| 152 ['-g', '-m32', '-lm', '-lpthread', | 152 ['-g', '-m32', '-lm', '-lpthread', |
| 153 '-Wl,--defsym=__Sz_AbsoluteZero=0']) | 153 '-Wl,--defsym=__Sz_AbsoluteZero=0']) |
| 154 shellcmd([compiler, args.driver] + objs + | 154 shellcmd([compiler, args.driver] + objs + |
| 155 ['-o', os.path.join(args.dir, args.output)] + sb_native_args) | 155 ['-o', os.path.join(args.dir, args.output)] + sb_native_args) |
| 156 | 156 |
| 157 if __name__ == '__main__': | 157 if __name__ == '__main__': |
| 158 main() | 158 main() |
| OLD | NEW |