Allow subzero tests to pass without le32-nacl-objdump.

pydir/run-pnacl-sz.py

@@ -31,6 +31,9 @@ def TargetDisassemblerFlags(target):
             'mips32':[] }
   return flags[target]
 
+def GetObjdumpCmd():
+  """Return a suitable objdump command."""
+  return 'arm-nacl-objdump'
 
 def main():
     """Run the pnacl-sz compiler on an llvm file.
@@ -196,7 +199,7 @@ def main():
       cmd += ['-o', output_file_name]
     if args.disassemble:
       # Show wide instruction encodings, diassemble, and show relocs.
-      cmd += (['&&', os.path.join(pnacl_bin_path, 'le32-nacl-objdump')] +
+      cmd += (['&&', os.path.join(pnacl_bin_path, GetObjdumpCmd())] +
               args.dis_flags +
               ['-w', '-d', '-r'] + TargetDisassemblerFlags(args.target) +
               [output_file_name])

tests_lit/lit.cfg

@@ -111,7 +111,6 @@ config.substitutions.append(('%pnacl_sz', pnacl_sz_tool))
 
 pnaclbintools = [r'\b' + x + r'\b' for x in
                  ['FileCheck',
-                  'le32-nacl-objdump',
                   'llvm-as',
                   'llvm-mc',
                   'llvm-readobj',

tests_lit/llvm2ice_tests/elf_container.ll

@@ -17,9 +17,8 @@
 ; RUN:   | %if --need=allow_dump --command FileCheck %s
 
 ; Add a run that shows relocations in code inline.
-; RUN: %p2i -i %s --filetype=obj --output %t --args -O2 --verbose none \
+; RUN: %p2i -i %s --filetype=obj --output %t --disassemble --args -O2 \
 ; RUN:   -allow-externally-defined-symbols \
-; RUN:   && le32-nacl-objdump -w -d -r -Mintel %t \
 ; RUN:   | FileCheck --check-prefix=TEXT-RELOCS %s
 
 ; Use intrinsics to test external calls.