Chromium Code Reviews| Index: pydir/crosstest.py |
| diff --git a/pydir/crosstest.py b/pydir/crosstest.py |
| index 4846815971c05275487b79b6aa28cd7562c31a4e..06df411a44b8e8dd48eebb8da44763bf2e19f8c5 100755 |
| --- a/pydir/crosstest.py |
| +++ b/pydir/crosstest.py |
| @@ -35,7 +35,7 @@ def main(): |
| # are more confident. +/- 4095 is the limit, so test |
| # somewhere near that boundary. |
| 'arm32': ['--skip-unimplemented', |
| - '--test-stack-extra', '4084'] |
|
Jim Stichnoth
2015/09/24 05:57:13
This seems useful for full testing, so why remove
John
2015/09/24 21:28:39
Because the lowering is broken. I added a todo to
|
| + '--test-stack-extra', '0'] |
| } |
| arch_llc_flags_extra = { |
| # Use sse2 instructions regardless of input -mattr |
| @@ -122,7 +122,8 @@ def main(): |
| bitcode_nonfinal = os.path.join(args.dir, base + '.' + key + '.bc') |
| bitcode = os.path.join(args.dir, base + '.' + key + '.pnacl.ll') |
| shellcmd(['{bin}/pnacl-clang'.format(bin=bindir), |
| - ('-O2' if args.clang_opt else '-O0'), '-c', arg, |
| + ('-O2' if args.clang_opt else '-O0'), |
| + ('-DARM32' if args.target == 'arm32' else ''), '-c', arg, |
| '-o', bitcode_nonfinal]) |
| shellcmd(['{bin}/pnacl-opt'.format(bin=bindir), |
| '-pnacl-abi-simplify-preopt', |
| @@ -185,12 +186,16 @@ def main(): |
| # configuration. In order to run the crosstests we play nasty, dangerous |
| # tricks with the stack pointer. |
| needs_stack_hack = (args.target == 'x8664') |
| - stack_hack_params = [] |
| + target_params = [] |
| if needs_stack_hack: |
| shellcmd('{bin}/clang -g -o stack_hack.x8664.{key}.o -c ' |
| 'stack_hack.x8664.c'.format(bin=bindir, key=key)) |
| - stack_hack_params.append('-DX8664_STACK_HACK') |
| - stack_hack_params.append('stack_hack.x8664.{key}.o'.format(key=key)) |
| + target_params.append('-DX8664_STACK_HACK') |
| + target_params.append('stack_hack.x8664.{key}.o'.format(key=key)) |
| + |
| + if args.target == 'arm32': |
| + target_params.append('-DARM32') |
| + target_params.append('-static') |
| # Set compiler to clang, clang++, pnacl-clang, or pnacl-clang++. |
| compiler = '{bin}/{prefix}{cc}'.format( |
| @@ -204,7 +209,7 @@ def main(): |
| '-lm', '-lpthread', |
| '-Wl,--defsym=__Sz_AbsoluteZero=0'] + |
| target_info.cross_headers) |
| - shellcmd([compiler] + stack_hack_params + [args.driver] + objs + |
| + shellcmd([compiler] + target_params + [args.driver] + objs + |
| ['-o', os.path.join(args.dir, args.output)] + sb_native_args) |
| if __name__ == '__main__': |