Add an cross include path for ARM to work around clang bug 22937.

pydir/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import subprocess
 import sys
 import tempfile
 
 import targets
 from utils import shellcmd
@@ skipping 148 matching lines @@
             shellcmd(['{bin}/pnacl-llc'.format(bin=bindir),
                       '-mtriple=' + triple,
                       '-externalize',
                       '-filetype=obj',
                       '-o=' + obj_llc,
                       bitcode] + llc_flags)
             objs.append(obj_llc)
         else:
             objs.append(arg)
 
-    # Add szrt_sb_x8632.o or szrt_native_x8632.o.
+    # Add szrt_sb_${target}.o or szrt_native_${target}.o.
     objs.append((
             '{root}/toolchain_build/src/subzero/build/runtime/' +
             'szrt_{sb}_' + args.target + '.o'
             ).format(root=nacl_root, sb='sb' if args.sandbox else 'native'))
     pure_c = os.path.splitext(args.driver)[1] == '.c'
     # Set compiler to clang, clang++, pnacl-clang, or pnacl-clang++.
     compiler = '{bin}/{prefix}{cc}'.format(
         bin=bindir, prefix='pnacl-' if args.sandbox else '',
         cc='clang' if pure_c else 'clang++')
-    sb_native_args = (['-O0', '--pnacl-allow-native', '-arch', 'x8632',
+    sb_native_args = (['-O0', '--pnacl-allow-native',
+                       '-arch', target_info.target,
                        '-Wn,-defsym=__Sz_AbsoluteZero=0']
                       if args.sandbox else
                       ['-g', '-target=' + triple,
                        '-lm', '-lpthread',
-                       '-Wl,--defsym=__Sz_AbsoluteZero=0'])
+                       '-Wl,--defsym=__Sz_AbsoluteZero=0'] +
+                      target_info.cross_headers)
     shellcmd([compiler, args.driver] + objs +
              ['-o', os.path.join(args.dir, args.output)] + sb_native_args)
 
 if __name__ == '__main__':
     main()