summaryrefslogtreecommitdiffstats
path: root/llvm/test/MC
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2019-05-01 05:27:20 +0000
committerFangrui Song <maskray@google.com>2019-05-01 05:27:20 +0000
commite29e30b1397f3e50f3487491f8a77ae08e4e3471 (patch)
tree214ee9eb6e3ea8b5007db0c5eee8bde4ea017c3f /llvm/test/MC
parentfccb505f0f59d94b0c46f2dd28fd8893ca45899d (diff)
downloadbcm5719-llvm-e29e30b1397f3e50f3487491f8a77ae08e4e3471.tar.gz
bcm5719-llvm-e29e30b1397f3e50f3487491f8a77ae08e4e3471.zip
[llvm-readobj] Change -long-option to --long-option in tests. NFC
We use both -long-option and --long-option in tests. Switch to --long-option for consistency. In the "llvm-readelf" mode, -long-option is discouraged as it conflicts with grouped short options and it is not accepted by GNU readelf. While updating the tests, change llvm-readobj -s to llvm-readobj -S to reduce confusion ("s" is --section-headers in llvm-readobj but --symbols in llvm-readelf). llvm-svn: 359649
Diffstat (limited to 'llvm/test/MC')
-rw-r--r--llvm/test/MC/AArch64/CheckDataSymbol.s2
-rw-r--r--llvm/test/MC/AArch64/arm64-be-datalayout.s2
-rw-r--r--llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s2
-rw-r--r--llvm/test/MC/AArch64/coff-align.s2
-rw-r--r--llvm/test/MC/AArch64/coff-debug.ll2
-rw-r--r--llvm/test/MC/AArch64/cold.s2
-rw-r--r--llvm/test/MC/AArch64/inst-directive.s4
-rw-r--r--llvm/test/MC/AArch64/seh.s2
-rw-r--r--llvm/test/MC/AMDGPU/hsa-exp.s2
-rw-r--r--llvm/test/MC/AMDGPU/hsa-text.s2
-rw-r--r--llvm/test/MC/AMDGPU/hsa-v3.s2
-rw-r--r--llvm/test/MC/AMDGPU/hsa.s2
-rw-r--r--llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s6
-rw-r--r--llvm/test/MC/AMDGPU/pal-msgpack.s2
-rw-r--r--llvm/test/MC/AMDGPU/pal.s2
-rw-r--r--llvm/test/MC/AMDGPU/reloc.s2
-rw-r--r--llvm/test/MC/ARM/2010-11-30-reloc-movt.s2
-rw-r--r--llvm/test/MC/ARM/CheckDataSymbol.s2
-rw-r--r--llvm/test/MC/ARM/Windows/multiple-text-sections.s2
-rw-r--r--llvm/test/MC/ARM/Windows/text-attributes.s2
-rw-r--r--llvm/test/MC/ARM/Windows/thumb-attributes.s2
-rw-r--r--llvm/test/MC/ARM/coff-file.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv2.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv2a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv3.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv3m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv4.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv4t.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv5.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv5t.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv5te.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6-m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6k.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6t2.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6z.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7-a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7-m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7-r.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7e-m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7em.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7r.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv8-a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv8.2-a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv8a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-iwmmxt.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-iwmmxt2.s2
-rw-r--r--llvm/test/MC/ARM/directive-cpu.s2
-rw-r--r--llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s2
-rw-r--r--llvm/test/MC/ARM/directive-eabi_attribute.s2
-rw-r--r--llvm/test/MC/ARM/directive-even.s2
-rw-r--r--llvm/test/MC/ARM/directive-fpu-multiple.s2
-rw-r--r--llvm/test/MC/ARM/directive-fpu.s2
-rw-r--r--llvm/test/MC/ARM/directive-object_arch-2.s2
-rw-r--r--llvm/test/MC/ARM/directive-object_arch.s2
-rw-r--r--llvm/test/MC/ARM/eh-compact-pr0.s2
-rw-r--r--llvm/test/MC/ARM/eh-compact-pr1.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-cantunwind.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-handlerdata.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-integrated-test.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-movsp.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-multiple-offsets.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-pad.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-personality.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-personalityindex.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-save.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-section-comdat.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-section-multiple-func.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-section.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-setfp.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-text-section.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-vsave.s2
-rw-r--r--llvm/test/MC/ARM/eh-link.s2
-rw-r--r--llvm/test/MC/ARM/elf-thumbfunc-reloc2.s2
-rw-r--r--llvm/test/MC/ARM/inst-directive.s4
-rw-r--r--llvm/test/MC/ARM/mappingsymbols.s18
-rw-r--r--llvm/test/MC/AsmParser/section.s2
-rw-r--r--llvm/test/MC/AsmParser/section_names.s2
-rw-r--r--llvm/test/MC/COFF/addrsig.s2
-rw-r--r--llvm/test/MC/COFF/align-nops.s2
-rw-r--r--llvm/test/MC/COFF/basic-coff-64.s2
-rw-r--r--llvm/test/MC/COFF/basic-coff.s2
-rw-r--r--llvm/test/MC/COFF/bss.s4
-rw-r--r--llvm/test/MC/COFF/comm-align.s2
-rw-r--r--llvm/test/MC/COFF/cross-section-relative.s2
-rw-r--r--llvm/test/MC/COFF/cv-def-range-gap.s2
-rw-r--r--llvm/test/MC/COFF/cv-def-range.s2
-rw-r--r--llvm/test/MC/COFF/cv-empty-file-table.s2
-rw-r--r--llvm/test/MC/COFF/cv-empty-linetable.s2
-rw-r--r--llvm/test/MC/COFF/cv-fpo-csrs.s2
-rw-r--r--llvm/test/MC/COFF/cv-fpo-realign.s2
-rw-r--r--llvm/test/MC/COFF/cv-fpo-setframe.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable-infloop.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable-unlikely.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable-unreachable.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable.s2
-rw-r--r--llvm/test/MC/COFF/cv-loc-unreachable-2.s2
-rw-r--r--llvm/test/MC/COFF/cv-loc-unreachable.s2
-rw-r--r--llvm/test/MC/COFF/cv-loc.s2
-rw-r--r--llvm/test/MC/COFF/cv-string.s2
-rw-r--r--llvm/test/MC/COFF/diff.s2
-rw-r--r--llvm/test/MC/COFF/directive-section-characteristics.ll2
-rw-r--r--llvm/test/MC/COFF/early-dce.s2
-rw-r--r--llvm/test/MC/COFF/eh-frame.s2
-rw-r--r--llvm/test/MC/COFF/file.s2
-rw-r--r--llvm/test/MC/COFF/linkonce.s4
-rw-r--r--llvm/test/MC/COFF/module-asm.ll4
-rw-r--r--llvm/test/MC/COFF/pr28462.s2
-rw-r--r--llvm/test/MC/COFF/secidx.s2
-rw-r--r--llvm/test/MC/COFF/secrel32-undef.s2
-rw-r--r--llvm/test/MC/COFF/secrel32.s2
-rw-r--r--llvm/test/MC/COFF/section-comdat.s4
-rw-r--r--llvm/test/MC/COFF/section-name-encoding.s2
-rw-r--r--llvm/test/MC/COFF/section.s4
-rw-r--r--llvm/test/MC/COFF/seh-align1.s2
-rw-r--r--llvm/test/MC/COFF/seh-align2.s2
-rw-r--r--llvm/test/MC/COFF/seh-align3.s2
-rw-r--r--llvm/test/MC/COFF/seh-linkonce.s2
-rw-r--r--llvm/test/MC/COFF/seh-section-2.s2
-rw-r--r--llvm/test/MC/COFF/seh-section.s2
-rw-r--r--llvm/test/MC/COFF/seh.s2
-rw-r--r--llvm/test/MC/COFF/simple-fixups.s4
-rw-r--r--llvm/test/MC/COFF/symbol-fragment-offset-64.s2
-rw-r--r--llvm/test/MC/COFF/symbol-fragment-offset.s2
-rw-r--r--llvm/test/MC/ELF/ARM/clang-section.s2
-rw-r--r--llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s2
-rw-r--r--llvm/test/MC/ELF/ARM/execute-only-section.s2
-rw-r--r--llvm/test/MC/ELF/ARM/execute-only-text-section-data.s2
-rw-r--r--llvm/test/MC/ELF/addrsig.s6
-rw-r--r--llvm/test/MC/ELF/align-bss.s2
-rw-r--r--llvm/test/MC/ELF/align-nops.s2
-rw-r--r--llvm/test/MC/ELF/align-size.s2
-rw-r--r--llvm/test/MC/ELF/align-text.s2
-rw-r--r--llvm/test/MC/ELF/align.s2
-rw-r--r--llvm/test/MC/ELF/basic-elf-32.s2
-rw-r--r--llvm/test/MC/ELF/basic-elf-64.s2
-rw-r--r--llvm/test/MC/ELF/cfi-adjust-cfa-offset.s2
-rw-r--r--llvm/test/MC/ELF/cfi-advance-loc2.s2
-rw-r--r--llvm/test/MC/ELF/cfi-def-cfa-offset.s2
-rw-r--r--llvm/test/MC/ELF/cfi-def-cfa-register.s2
-rw-r--r--llvm/test/MC/ELF/cfi-def-cfa.s2
-rw-r--r--llvm/test/MC/ELF/cfi-escape.s2
-rw-r--r--llvm/test/MC/ELF/cfi-large-model.s4
-rw-r--r--llvm/test/MC/ELF/cfi-offset.s2
-rw-r--r--llvm/test/MC/ELF/cfi-register.s2
-rw-r--r--llvm/test/MC/ELF/cfi-rel-offset.s2
-rw-r--r--llvm/test/MC/ELF/cfi-rel-offset2.s2
-rw-r--r--llvm/test/MC/ELF/cfi-remember.s2
-rw-r--r--llvm/test/MC/ELF/cfi-restore.s2
-rw-r--r--llvm/test/MC/ELF/cfi-same-value.s2
-rw-r--r--llvm/test/MC/ELF/cfi-sections.s12
-rw-r--r--llvm/test/MC/ELF/cfi-signal-frame.s2
-rw-r--r--llvm/test/MC/ELF/cfi-undefined.s2
-rw-r--r--llvm/test/MC/ELF/cfi-window-save.s2
-rw-r--r--llvm/test/MC/ELF/cfi-zero-addr-delta.s2
-rw-r--r--llvm/test/MC/ELF/cfi.s2
-rw-r--r--llvm/test/MC/ELF/cgprofile.ll2
-rw-r--r--llvm/test/MC/ELF/cgprofile.s2
-rw-r--r--llvm/test/MC/ELF/comdat-dup-group-name.s2
-rw-r--r--llvm/test/MC/ELF/comdat-name-number.s2
-rw-r--r--llvm/test/MC/ELF/comdat-reloc.s2
-rw-r--r--llvm/test/MC/ELF/comdat.s2
-rw-r--r--llvm/test/MC/ELF/common2.s2
-rw-r--r--llvm/test/MC/ELF/compression.s6
-rw-r--r--llvm/test/MC/ELF/debug-line.s2
-rw-r--r--llvm/test/MC/ELF/debug-line2.s2
-rw-r--r--llvm/test/MC/ELF/debug-loc.s2
-rw-r--r--llvm/test/MC/ELF/dot-symbol-assignment.s2
-rw-r--r--llvm/test/MC/ELF/empty-dwarf-lines.s2
-rw-r--r--llvm/test/MC/ELF/empty.s6
-rw-r--r--llvm/test/MC/ELF/entsize.ll2
-rw-r--r--llvm/test/MC/ELF/entsize.s2
-rw-r--r--llvm/test/MC/ELF/exclude-debug-dwo.s2
-rw-r--r--llvm/test/MC/ELF/global-offset.s2
-rw-r--r--llvm/test/MC/ELF/ident.s2
-rw-r--r--llvm/test/MC/ELF/leb128.s2
-rw-r--r--llvm/test/MC/ELF/local-reloc.s2
-rw-r--r--llvm/test/MC/ELF/many-sections-2.s2
-rw-r--r--llvm/test/MC/ELF/many-sections.s2
-rw-r--r--llvm/test/MC/ELF/n_bytes.s2
-rw-r--r--llvm/test/MC/ELF/noexec.s2
-rw-r--r--llvm/test/MC/ELF/org.s2
-rw-r--r--llvm/test/MC/ELF/popsection.s2
-rw-r--r--llvm/test/MC/ELF/relax.s2
-rw-r--r--llvm/test/MC/ELF/relocation-pc.s2
-rw-r--r--llvm/test/MC/ELF/relocation-tls.s2
-rw-r--r--llvm/test/MC/ELF/relocation.s2
-rw-r--r--llvm/test/MC/ELF/rename.s2
-rw-r--r--llvm/test/MC/ELF/section-numeric-flag.s2
-rw-r--r--llvm/test/MC/ELF/section-numeric-invalid-type.s2
-rw-r--r--llvm/test/MC/ELF/section-numeric-type.s2
-rw-r--r--llvm/test/MC/ELF/section-sym.s2
-rw-r--r--llvm/test/MC/ELF/section.s2
-rw-r--r--llvm/test/MC/ELF/sleb.s8
-rw-r--r--llvm/test/MC/ELF/strtab-suffix-opt.s2
-rw-r--r--llvm/test/MC/ELF/uleb-ehtable.s8
-rw-r--r--llvm/test/MC/ELF/uleb.s8
-rw-r--r--llvm/test/MC/ELF/version.s2
-rw-r--r--llvm/test/MC/ELF/zero.s2
-rw-r--r--llvm/test/MC/Hexagon/elf-flags.s8
-rw-r--r--llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s2
-rw-r--r--llvm/test/MC/MachO/ARM/aliased-symbols.s2
-rw-r--r--llvm/test/MC/MachO/ARM/build-version-encode.s2
-rw-r--r--llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s2
-rw-r--r--llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s2
-rw-r--r--llvm/test/MC/MachO/ARM/empty-function-nop.ll8
-rw-r--r--llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s2
-rw-r--r--llvm/test/MC/MachO/ARM/no-subsections-reloc.s2
-rw-r--r--llvm/test/MC/MachO/ARM/nop-armv4-padding.s2
-rw-r--r--llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s2
-rw-r--r--llvm/test/MC/MachO/ARM/nop-thumb-padding.s2
-rw-r--r--llvm/test/MC/MachO/ARM/nop-thumb2-padding.s2
-rw-r--r--llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s2
-rw-r--r--llvm/test/MC/MachO/ARM/relax-thumb2-branches.s2
-rw-r--r--llvm/test/MC/MachO/ARM/thumb-bl-jbits.s2
-rw-r--r--llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s2
-rw-r--r--llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s2
-rw-r--r--llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s2
-rw-r--r--llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s2
-rw-r--r--llvm/test/MC/MachO/absolute.s2
-rw-r--r--llvm/test/MC/MachO/absolutize.s2
-rw-r--r--llvm/test/MC/MachO/bss.s4
-rw-r--r--llvm/test/MC/MachO/coal-sections-x86_64.s2
-rw-r--r--llvm/test/MC/MachO/comm-1.s2
-rw-r--r--llvm/test/MC/MachO/darwin-complex-difference.s2
-rw-r--r--llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s2
-rw-r--r--llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s2
-rw-r--r--llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s2
-rw-r--r--llvm/test/MC/MachO/data.s2
-rw-r--r--llvm/test/MC/MachO/debug_frame.s2
-rw-r--r--llvm/test/MC/MachO/diff-with-two-sections.s2
-rw-r--r--llvm/test/MC/MachO/direction_labels.s2
-rw-r--r--llvm/test/MC/MachO/file.s2
-rw-r--r--llvm/test/MC/MachO/indirect-symbols.s2
-rw-r--r--llvm/test/MC/MachO/jcc.s2
-rw-r--r--llvm/test/MC/MachO/lcomm-attributes.s2
-rw-r--r--llvm/test/MC/MachO/linker-option-2.s2
-rw-r--r--llvm/test/MC/MachO/linker-options.ll2
-rw-r--r--llvm/test/MC/MachO/loc.s2
-rw-r--r--llvm/test/MC/MachO/pcrel-to-other-section.s2
-rw-r--r--llvm/test/MC/MachO/relax-jumps.s2
-rw-r--r--llvm/test/MC/MachO/relax-recompute-align.s2
-rw-r--r--llvm/test/MC/MachO/reloc-pcrel-offset.s2
-rw-r--r--llvm/test/MC/MachO/reloc.s2
-rw-r--r--llvm/test/MC/MachO/section-align-1.s2
-rw-r--r--llvm/test/MC/MachO/section-align-2.s2
-rw-r--r--llvm/test/MC/MachO/section-attributes.s2
-rw-r--r--llvm/test/MC/MachO/section-flags.s2
-rw-r--r--llvm/test/MC/MachO/string-table.s2
-rw-r--r--llvm/test/MC/MachO/symbol-diff.s2
-rw-r--r--llvm/test/MC/MachO/symbol-flags.s2
-rw-r--r--llvm/test/MC/MachO/symbol-indirect.s2
-rw-r--r--llvm/test/MC/MachO/symbols-1.s4
-rw-r--r--llvm/test/MC/MachO/tbss.s2
-rw-r--r--llvm/test/MC/MachO/tdata.s2
-rw-r--r--llvm/test/MC/MachO/thread_init_func.s2
-rw-r--r--llvm/test/MC/MachO/tls.s2
-rw-r--r--llvm/test/MC/MachO/tlv-bss.ll2
-rw-r--r--llvm/test/MC/MachO/tlv-reloc.s2
-rw-r--r--llvm/test/MC/MachO/tlv.s2
-rw-r--r--llvm/test/MC/MachO/values.s2
-rw-r--r--llvm/test/MC/MachO/variable-exprs.s4
-rw-r--r--llvm/test/MC/MachO/weakdef.s2
-rw-r--r--llvm/test/MC/MachO/x86_32-optimal_nop.s2
-rw-r--r--llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s2
-rw-r--r--llvm/test/MC/MachO/x86_32-sections.s2
-rw-r--r--llvm/test/MC/MachO/x86_32-symbols.s2
-rw-r--r--llvm/test/MC/MachO/x86_64-sections.s2
-rw-r--r--llvm/test/MC/MachO/zero-space.s2
-rw-r--r--llvm/test/MC/MachO/zerofill-1.s2
-rw-r--r--llvm/test/MC/MachO/zerofill-2.s2
-rw-r--r--llvm/test/MC/MachO/zerofill-3.s2
-rw-r--r--llvm/test/MC/MachO/zerofill-5.s2
-rw-r--r--llvm/test/MC/Mips/addend.s2
-rw-r--r--llvm/test/MC/Mips/cfi-advance-loc.s4
-rw-r--r--llvm/test/MC/Mips/crc/module-crc.s2
-rw-r--r--llvm/test/MC/Mips/crc/module-nocrc.s2
-rw-r--r--llvm/test/MC/Mips/directive-ent.s4
-rw-r--r--llvm/test/MC/Mips/elf-bigendian.ll2
-rw-r--r--llvm/test/MC/Mips/elf-debug-section.s2
-rw-r--r--llvm/test/MC/Mips/elf_reginfo.s4
-rw-r--r--llvm/test/MC/Mips/end-directive.s2
-rw-r--r--llvm/test/MC/Mips/ginv/module-ginv.s2
-rw-r--r--llvm/test/MC/Mips/ginv/module-noginv.s2
-rw-r--r--llvm/test/MC/Mips/insn-directive.s2
-rw-r--r--llvm/test/MC/Mips/micromips-ase-directive.s2
-rw-r--r--llvm/test/MC/Mips/mips-cop0-reginfo.s2
-rw-r--r--llvm/test/MC/Mips/mips-data-directives.s2
-rw-r--r--llvm/test/MC/Mips/mips-pdr.s2
-rw-r--r--llvm/test/MC/Mips/mips-rdata.s2
-rw-r--r--llvm/test/MC/Mips/mips-reginfo-fp32.s2
-rw-r--r--llvm/test/MC/Mips/mips-reginfo-fp64.s6
-rw-r--r--llvm/test/MC/Mips/mips32/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips32r2/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips32r3/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips32r5/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips64/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips64eb-fixups.s2
-rw-r--r--llvm/test/MC/Mips/mips64r2/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips64r3/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips64r5/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mips_abi_flags_xx.s8
-rw-r--r--llvm/test/MC/Mips/mips_abi_flags_xx_set.s2
-rw-r--r--llvm/test/MC/Mips/module-hardfloat.s2
-rw-r--r--llvm/test/MC/Mips/module-softfloat.s2
-rw-r--r--llvm/test/MC/Mips/msa/abiflags.s2
-rw-r--r--llvm/test/MC/Mips/mt/abiflag.s2
-rw-r--r--llvm/test/MC/Mips/mt/module-directive.s2
-rw-r--r--llvm/test/MC/Mips/mt/set-directive.s2
-rw-r--r--llvm/test/MC/Mips/nooddspreg-cmdarg.s2
-rw-r--r--llvm/test/MC/Mips/nooddspreg.s2
-rw-r--r--llvm/test/MC/Mips/oddspreg.s12
-rw-r--r--llvm/test/MC/Mips/reloc-directive.s6
-rw-r--r--llvm/test/MC/Mips/relocation-n64.s2
-rw-r--r--llvm/test/MC/Mips/relocation-xfail.s2
-rw-r--r--llvm/test/MC/Mips/relocation.s2
-rw-r--r--llvm/test/MC/Mips/section-size.s2
-rw-r--r--llvm/test/MC/Mips/sym-offset.ll2
-rw-r--r--llvm/test/MC/Mips/virt/module-novirt.s2
-rw-r--r--llvm/test/MC/Mips/virt/module-virt.s2
-rw-r--r--llvm/test/MC/PowerPC/lcomm.s4
-rw-r--r--llvm/test/MC/PowerPC/ppc-llong.s6
-rw-r--r--llvm/test/MC/PowerPC/ppc-nop.s6
-rw-r--r--llvm/test/MC/PowerPC/ppc-word.s6
-rw-r--r--llvm/test/MC/PowerPC/ppc64-fixup-apply.s4
-rw-r--r--llvm/test/MC/PowerPC/ppc64-initial-cfa.s8
-rw-r--r--llvm/test/MC/PowerPC/ppc64-localentry.s4
-rw-r--r--llvm/test/MC/RISCV/elf-flags.s10
-rw-r--r--llvm/test/MC/RISCV/target-abi-valid.s30
-rw-r--r--llvm/test/MC/Sparc/sparc-nop-data.s4
-rw-r--r--llvm/test/MC/SystemZ/word.s2
-rw-r--r--llvm/test/MC/WebAssembly/custom-sections.ll2
-rw-r--r--llvm/test/MC/WebAssembly/debug-info.ll2
-rw-r--r--llvm/test/MC/WebAssembly/event-section.ll2
-rw-r--r--llvm/test/MC/WebAssembly/file-headers.ll2
-rw-r--r--llvm/test/MC/WebAssembly/func-address.ll2
-rw-r--r--llvm/test/MC/WebAssembly/function-alias.ll2
-rw-r--r--llvm/test/MC/WebAssembly/reloc-code.ll2
-rw-r--r--llvm/test/MC/WebAssembly/reloc-data.ll2
-rw-r--r--llvm/test/MC/WebAssembly/sections.ll2
-rw-r--r--llvm/test/MC/X86/AlignedBundling/section-alignment.s2
-rw-r--r--llvm/test/MC/X86/cfi_def_cfa-crash.s2
-rw-r--r--llvm/test/MC/X86/eval-fill.s2
-rw-r--r--llvm/test/MC/X86/fp-setup-macho.s2
-rw-r--r--llvm/test/MC/X86/large-bss.s2
-rw-r--r--llvm/test/MC/X86/no-elf-compact-unwind.s6
-rw-r--r--llvm/test/MC/X86/reloc-directive.s4
-rw-r--r--llvm/test/MC/X86/x86-evenDirective.s2
352 files changed, 449 insertions, 449 deletions
diff --git a/llvm/test/MC/AArch64/CheckDataSymbol.s b/llvm/test/MC/AArch64/CheckDataSymbol.s
index ea3ed7b2873..f3492380ac1 100644
--- a/llvm/test/MC/AArch64/CheckDataSymbol.s
+++ b/llvm/test/MC/AArch64/CheckDataSymbol.s
@@ -1,6 +1,6 @@
# RUN: llvm-mc -filetype=obj -assemble \
# RUN: -triple=aarch64- %s -o - \
-# RUN: | llvm-readobj -s -t - | FileCheck %s
+# RUN: | llvm-readobj -S -t - | FileCheck %s
# CHECK: Name: $d.1 ({{[1-9][0-9]+}})
# CHECK-NEXT: Value: 0x4
# CHECK-NEXT: Size: 0
diff --git a/llvm/test/MC/AArch64/arm64-be-datalayout.s b/llvm/test/MC/AArch64/arm64-be-datalayout.s
index a5b48f1c594..67dd6fb1e57 100644
--- a/llvm/test/MC/AArch64/arm64-be-datalayout.s
+++ b/llvm/test/MC/AArch64/arm64-be-datalayout.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple aarch64_be %s | llvm-readobj -section-data -sections | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple aarch64_be %s | llvm-readobj --section-data -S | FileCheck %s
// CHECK: 0000: 00123456 789ABCDE
foo: .xword 0x123456789abcde
diff --git a/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s b/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s
index 1619a50f6b0..7cbab059453 100644
--- a/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s
+++ b/llvm/test/MC/AArch64/arm64-leaf-compact-unwind.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple=arm64-apple-ios -filetype=obj < %s | \
-// RUN: llvm-readobj --expand-relocs -sections -section-relocations -section-data | \
+// RUN: llvm-readobj --expand-relocs -S --section-relocations --section-data | \
// RUN: FileCheck %s
//
// rdar://13070556
diff --git a/llvm/test/MC/AArch64/coff-align.s b/llvm/test/MC/AArch64/coff-align.s
index b649804eb8f..b76bd73a629 100644
--- a/llvm/test/MC/AArch64/coff-align.s
+++ b/llvm/test/MC/AArch64/coff-align.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple aarch64-windows-gnu %s | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple aarch64-windows-gnu %s | llvm-readobj -S --sd | FileCheck %s
.text
.align 5
f0:
diff --git a/llvm/test/MC/AArch64/coff-debug.ll b/llvm/test/MC/AArch64/coff-debug.ll
index 53f8b428e74..f336ea26da8 100644
--- a/llvm/test/MC/AArch64/coff-debug.ll
+++ b/llvm/test/MC/AArch64/coff-debug.ll
@@ -1,5 +1,5 @@
; RUN: llc -mtriple=aarch64-windows -filetype=obj -o - %s | \
-; RUN: llvm-readobj -codeview - | FileCheck %s
+; RUN: llvm-readobj --codeview - | FileCheck %s
; ModuleID = 'a.c'
source_filename = "a.c"
diff --git a/llvm/test/MC/AArch64/cold.s b/llvm/test/MC/AArch64/cold.s
index 44cb52fd794..812d7725454 100644
--- a/llvm/test/MC/AArch64/cold.s
+++ b/llvm/test/MC/AArch64/cold.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple aarch64-apple-ios -o - -filetype=obj %s | \
-// RUN: llvm-readobj -symbols | FileCheck %s -check-prefix=READOBJ
+// RUN: llvm-readobj --symbols | FileCheck %s -check-prefix=READOBJ
// READOBJ-LABEL: Name: cold_func
// READOBJ-NEXT: Type: Section
diff --git a/llvm/test/MC/AArch64/inst-directive.s b/llvm/test/MC/AArch64/inst-directive.s
index 1a44fd18620..e4ccf788b0e 100644
--- a/llvm/test/MC/AArch64/inst-directive.s
+++ b/llvm/test/MC/AArch64/inst-directive.s
@@ -1,13 +1,13 @@
// RUN: llvm-mc %s -triple=aarch64-none-linux-gnu -filetype=asm -o - \
// RUN: | FileCheck %s --check-prefix=CHECK-ASM
// RUN: llvm-mc %s -triple=aarch64-none-linux-gnu -filetype=obj -o %t
-// RUN: llvm-readobj -s -sd %t | FileCheck %s --check-prefix=CHECK-OBJ
+// RUN: llvm-readobj -S --sd %t | FileCheck %s --check-prefix=CHECK-OBJ
// RUN: llvm-objdump -t %t | FileCheck %s --check-prefix=CHECK-SYMS
// RUN: llvm-mc %s -triple=aarch64_be-none-linux-gnu -filetype=asm -o - \
// RUN: | FileCheck %s --check-prefix=CHECK-ASM
// RUN: llvm-mc %s -triple=aarch64_be-none-linux-gnu -filetype=obj -o %t
-// RUN: llvm-readobj -s -sd %t | FileCheck %s --check-prefix=CHECK-OBJ
+// RUN: llvm-readobj -S --sd %t | FileCheck %s --check-prefix=CHECK-OBJ
// RUN: llvm-objdump -t %t | FileCheck %s --check-prefix=CHECK-SYMS
.section .inst.aarch64_inst
diff --git a/llvm/test/MC/AArch64/seh.s b/llvm/test/MC/AArch64/seh.s
index ca862cb4e54..d4acc4fddb9 100644
--- a/llvm/test/MC/AArch64/seh.s
+++ b/llvm/test/MC/AArch64/seh.s
@@ -1,6 +1,6 @@
// This test checks that the SEH directives emit the correct unwind data.
-// RUN: llvm-mc -triple aarch64-pc-win32 -filetype=obj %s | llvm-readobj -s -r | FileCheck %s
+// RUN: llvm-mc -triple aarch64-pc-win32 -filetype=obj %s | llvm-readobj -S -r | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/AMDGPU/hsa-exp.s b/llvm/test/MC/AMDGPU/hsa-exp.s
index 8900a0638c9..cb7c0be8b02 100644
--- a/llvm/test/MC/AMDGPU/hsa-exp.s
+++ b/llvm/test/MC/AMDGPU/hsa-exp.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF
// ELF: Section {
// ELF: Name: .text
diff --git a/llvm/test/MC/AMDGPU/hsa-text.s b/llvm/test/MC/AMDGPU/hsa-text.s
index f4463fc5936..d4f67d03347 100644
--- a/llvm/test/MC/AMDGPU/hsa-text.s
+++ b/llvm/test/MC/AMDGPU/hsa-text.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF
// For compatibility reasons we treat convert .text sections to .hsatext
diff --git a/llvm/test/MC/AMDGPU/hsa-v3.s b/llvm/test/MC/AMDGPU/hsa-v3.s
index 41d62c2b828..1eb8f5edd9d 100644
--- a/llvm/test/MC/AMDGPU/hsa-v3.s
+++ b/llvm/test/MC/AMDGPU/hsa-v3.s
@@ -1,6 +1,6 @@
// RUN: llvm-mc -mattr=+code-object-v3 -triple amdgcn-amd-amdhsa -mcpu=gfx904 -mattr=+xnack < %s | FileCheck --check-prefix=ASM %s
// RUN: llvm-mc -mattr=+code-object-v3 -triple amdgcn-amd-amdhsa -mcpu=gfx904 -mattr=+xnack -filetype=obj < %s > %t
-// RUN: llvm-readobj -elf-output-style=GNU -sections -symbols -relocations %t | FileCheck --check-prefix=READOBJ %s
+// RUN: llvm-readelf -sections -symbols -relocations %t | FileCheck --check-prefix=READOBJ %s
// RUN: llvm-objdump -s -j .rodata %t | FileCheck --check-prefix=OBJDUMP %s
// big endian not supported
diff --git a/llvm/test/MC/AMDGPU/hsa.s b/llvm/test/MC/AMDGPU/hsa.s
index 0521c10e1a8..9eda20da063 100644
--- a/llvm/test/MC/AMDGPU/hsa.s
+++ b/llvm/test/MC/AMDGPU/hsa.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF
// ELF: Section {
// ELF: Name: .text
diff --git a/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s b/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s
index 950f32cd19a..b84727cf1da 100644
--- a/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s
+++ b/llvm/test/MC/AMDGPU/hsa_code_object_isa_args.s
@@ -1,9 +1,9 @@
// RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM --check-prefix=ASM_700
// RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM --check-prefix=ASM_803
// RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=stoney -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM --check-prefix=ASM_810
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_700
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_803
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=stoney -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -s -sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_810
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_700
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_803
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=stoney -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -S --sd | FileCheck %s --check-prefix=ELF --check-prefix=ELF_810
// ELF: SHT_NOTE
// ELF: 0000: 04000000 08000000 01000000 414D4400
diff --git a/llvm/test/MC/AMDGPU/pal-msgpack.s b/llvm/test/MC/AMDGPU/pal-msgpack.s
index 52a967c8005..a5599f3a494 100644
--- a/llvm/test/MC/AMDGPU/pal-msgpack.s
+++ b/llvm/test/MC/AMDGPU/pal-msgpack.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF
.amdgpu_pal_metadata
---
diff --git a/llvm/test/MC/AMDGPU/pal.s b/llvm/test/MC/AMDGPU/pal.s
index 45ace4e549a..913738727af 100644
--- a/llvm/test/MC/AMDGPU/pal.s
+++ b/llvm/test/MC/AMDGPU/pal.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF
+// RUN: llvm-mc -filetype=obj -triple amdgcn--amdpal -mcpu=kaveri -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF
.amd_amdgpu_pal_metadata 0x12345678, 0xfedcba98, 0x2468ace0, 0xfdb97531
// ASM: .amd_amdgpu_pal_metadata 0x12345678,0xfedcba98,0x2468ace0,0xfdb97531
diff --git a/llvm/test/MC/AMDGPU/reloc.s b/llvm/test/MC/AMDGPU/reloc.s
index 0a349da49a3..593536f623c 100644
--- a/llvm/test/MC/AMDGPU/reloc.s
+++ b/llvm/test/MC/AMDGPU/reloc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple amdgcn-- -mcpu=kaveri -show-encoding %s | llvm-readobj -relocations | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple amdgcn-- -mcpu=kaveri -show-encoding %s | llvm-readobj -r | FileCheck %s
// CHECK: Relocations [
// CHECK: .rel.text {
diff --git a/llvm/test/MC/ARM/2010-11-30-reloc-movt.s b/llvm/test/MC/ARM/2010-11-30-reloc-movt.s
index 9f0553af182..a83465edc02 100644
--- a/llvm/test/MC/ARM/2010-11-30-reloc-movt.s
+++ b/llvm/test/MC/ARM/2010-11-30-reloc-movt.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc %s -triple=armv7-linux-gnueabi -filetype=obj -o - | \
-// RUN: llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-readobj -S --sr --sd | FileCheck %s
.syntax unified
.eabi_attribute 6, 10
diff --git a/llvm/test/MC/ARM/CheckDataSymbol.s b/llvm/test/MC/ARM/CheckDataSymbol.s
index 67930cc77b5..9fb2d018339 100644
--- a/llvm/test/MC/ARM/CheckDataSymbol.s
+++ b/llvm/test/MC/ARM/CheckDataSymbol.s
@@ -1,6 +1,6 @@
# RUN: llvm-mc -filetype=obj -assemble \
# RUN: -triple=arm-arm-none-eabi -mcpu=cortex-a9 %s -o - \
-# RUN: | llvm-readobj -s -t - | FileCheck %s
+# RUN: | llvm-readobj -S -t - | FileCheck %s
# CHECK: Name: $d.1 ({{[1-9][0-9]+}})
# CHECK-NEXT: Value: 0x4
# CHECK-NEXT: Size: 0
diff --git a/llvm/test/MC/ARM/Windows/multiple-text-sections.s b/llvm/test/MC/ARM/Windows/multiple-text-sections.s
index 241eee4bcad..6359f9cf254 100644
--- a/llvm/test/MC/ARM/Windows/multiple-text-sections.s
+++ b/llvm/test/MC/ARM/Windows/multiple-text-sections.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s - | FileCheck %s
+@ RUN: | llvm-readobj -S - | FileCheck %s
.syntax unified
.text
diff --git a/llvm/test/MC/ARM/Windows/text-attributes.s b/llvm/test/MC/ARM/Windows/text-attributes.s
index 62aa028789f..ea5ee8e95e0 100644
--- a/llvm/test/MC/ARM/Windows/text-attributes.s
+++ b/llvm/test/MC/ARM/Windows/text-attributes.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s - | FileCheck %s
+@ RUN: | llvm-readobj -S - | FileCheck %s
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/Windows/thumb-attributes.s b/llvm/test/MC/ARM/Windows/thumb-attributes.s
index 6396862f00a..5b589a3a669 100644
--- a/llvm/test/MC/ARM/Windows/thumb-attributes.s
+++ b/llvm/test/MC/ARM/Windows/thumb-attributes.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s - | FileCheck %s
+@ RUN: | llvm-readobj -S - | FileCheck %s
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/coff-file.s b/llvm/test/MC/ARM/coff-file.s
index d3f26f4c8f7..9caf0d4bcac 100644
--- a/llvm/test/MC/ARM/coff-file.s
+++ b/llvm/test/MC/ARM/coff-file.s
@@ -2,7 +2,7 @@
// RUN: | FileCheck %s
// RUN: llvm-mc -triple thumbv7-windows -filetype obj %s -o - \
-// RUN: | llvm-readobj -symbols | FileCheck %s -check-prefix CHECK-SCN
+// RUN: | llvm-readobj --symbols | FileCheck %s -check-prefix CHECK-SCN
.file "null-padded.asm"
// CHECK: (nx 1) {{0x[0-9]+}} .file
diff --git a/llvm/test/MC/ARM/directive-arch-armv2.s b/llvm/test/MC/ARM/directive-arch-armv2.s
index f6dc20c0a36..ceec7cfeda9 100644
--- a/llvm/test/MC/ARM/directive-arch-armv2.s
+++ b/llvm/test/MC/ARM/directive-arch-armv2.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv2
diff --git a/llvm/test/MC/ARM/directive-arch-armv2a.s b/llvm/test/MC/ARM/directive-arch-armv2a.s
index bb0a693dc84..c07718e2edb 100644
--- a/llvm/test/MC/ARM/directive-arch-armv2a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv2a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv2a
diff --git a/llvm/test/MC/ARM/directive-arch-armv3.s b/llvm/test/MC/ARM/directive-arch-armv3.s
index aeec638eac8..ad773c9cfaf 100644
--- a/llvm/test/MC/ARM/directive-arch-armv3.s
+++ b/llvm/test/MC/ARM/directive-arch-armv3.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv3
diff --git a/llvm/test/MC/ARM/directive-arch-armv3m.s b/llvm/test/MC/ARM/directive-arch-armv3m.s
index fda8db52e7b..be587827749 100644
--- a/llvm/test/MC/ARM/directive-arch-armv3m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv3m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv3m
diff --git a/llvm/test/MC/ARM/directive-arch-armv4.s b/llvm/test/MC/ARM/directive-arch-armv4.s
index fb838428403..78e97e7aee4 100644
--- a/llvm/test/MC/ARM/directive-arch-armv4.s
+++ b/llvm/test/MC/ARM/directive-arch-armv4.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv4
diff --git a/llvm/test/MC/ARM/directive-arch-armv4t.s b/llvm/test/MC/ARM/directive-arch-armv4t.s
index 33a5ae38575..11f06ef2025 100644
--- a/llvm/test/MC/ARM/directive-arch-armv4t.s
+++ b/llvm/test/MC/ARM/directive-arch-armv4t.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv4t
diff --git a/llvm/test/MC/ARM/directive-arch-armv5.s b/llvm/test/MC/ARM/directive-arch-armv5.s
index 73a8c95db79..a3cbaa93b95 100644
--- a/llvm/test/MC/ARM/directive-arch-armv5.s
+++ b/llvm/test/MC/ARM/directive-arch-armv5.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv5
diff --git a/llvm/test/MC/ARM/directive-arch-armv5t.s b/llvm/test/MC/ARM/directive-arch-armv5t.s
index 66a75c4c89e..fc1370f98cd 100644
--- a/llvm/test/MC/ARM/directive-arch-armv5t.s
+++ b/llvm/test/MC/ARM/directive-arch-armv5t.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv5t
diff --git a/llvm/test/MC/ARM/directive-arch-armv5te.s b/llvm/test/MC/ARM/directive-arch-armv5te.s
index f3932d84a56..42229206087 100644
--- a/llvm/test/MC/ARM/directive-arch-armv5te.s
+++ b/llvm/test/MC/ARM/directive-arch-armv5te.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv5te
diff --git a/llvm/test/MC/ARM/directive-arch-armv6-m.s b/llvm/test/MC/ARM/directive-arch-armv6-m.s
index d89a627740b..bc33f330eae 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6-m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6-m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6-m
diff --git a/llvm/test/MC/ARM/directive-arch-armv6.s b/llvm/test/MC/ARM/directive-arch-armv6.s
index fb489207355..04a963edaaa 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6
diff --git a/llvm/test/MC/ARM/directive-arch-armv6k.s b/llvm/test/MC/ARM/directive-arch-armv6k.s
index ee433fa283e..1af24942e13 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6k.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6k.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6k
diff --git a/llvm/test/MC/ARM/directive-arch-armv6t2.s b/llvm/test/MC/ARM/directive-arch-armv6t2.s
index 85f4491b0c6..dd9905cf1b8 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6t2.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6t2.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6t2
diff --git a/llvm/test/MC/ARM/directive-arch-armv6z.s b/llvm/test/MC/ARM/directive-arch-armv6z.s
index efb8f8bfe9d..509040f4578 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6z.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6z.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6z
diff --git a/llvm/test/MC/ARM/directive-arch-armv7-a.s b/llvm/test/MC/ARM/directive-arch-armv7-a.s
index 792429a4e04..6c1f8fcafd6 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7-a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7-a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7-a
diff --git a/llvm/test/MC/ARM/directive-arch-armv7-m.s b/llvm/test/MC/ARM/directive-arch-armv7-m.s
index 058f23ba2be..ac41bab5ca0 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7-m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7-m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7-m
diff --git a/llvm/test/MC/ARM/directive-arch-armv7-r.s b/llvm/test/MC/ARM/directive-arch-armv7-r.s
index 99481f70c5f..a7b57542610 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7-r.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7-r.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7-r
diff --git a/llvm/test/MC/ARM/directive-arch-armv7.s b/llvm/test/MC/ARM/directive-arch-armv7.s
index 0cd499666ea..104c7fec548 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7
diff --git a/llvm/test/MC/ARM/directive-arch-armv7a.s b/llvm/test/MC/ARM/directive-arch-armv7a.s
index 3bb202fb278..9189dedcbb5 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7a
diff --git a/llvm/test/MC/ARM/directive-arch-armv7e-m.s b/llvm/test/MC/ARM/directive-arch-armv7e-m.s
index f7c5d67b8fe..bebf2dcda65 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7e-m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7e-m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7e-m
diff --git a/llvm/test/MC/ARM/directive-arch-armv7em.s b/llvm/test/MC/ARM/directive-arch-armv7em.s
index f37398106de..ac6d1cc59df 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7em.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7em.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7em
diff --git a/llvm/test/MC/ARM/directive-arch-armv7m.s b/llvm/test/MC/ARM/directive-arch-armv7m.s
index 0e9f546387b..aafb3ee31e8 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7m
diff --git a/llvm/test/MC/ARM/directive-arch-armv7r.s b/llvm/test/MC/ARM/directive-arch-armv7r.s
index 9009d134128..d99b5da5074 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7r.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7r.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7r
diff --git a/llvm/test/MC/ARM/directive-arch-armv8-a.s b/llvm/test/MC/ARM/directive-arch-armv8-a.s
index 636378155e7..1b5152a4fd4 100644
--- a/llvm/test/MC/ARM/directive-arch-armv8-a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv8-a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv8-a
diff --git a/llvm/test/MC/ARM/directive-arch-armv8.2-a.s b/llvm/test/MC/ARM/directive-arch-armv8.2-a.s
index c9f4469fb0a..1118b126171 100644
--- a/llvm/test/MC/ARM/directive-arch-armv8.2-a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv8.2-a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv8.2-a
diff --git a/llvm/test/MC/ARM/directive-arch-armv8a.s b/llvm/test/MC/ARM/directive-arch-armv8a.s
index 4a1915c5343..0226231afc9 100644
--- a/llvm/test/MC/ARM/directive-arch-armv8a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv8a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv8a
diff --git a/llvm/test/MC/ARM/directive-arch-iwmmxt.s b/llvm/test/MC/ARM/directive-arch-iwmmxt.s
index c54846dbcc2..2a15bbe537c 100644
--- a/llvm/test/MC/ARM/directive-arch-iwmmxt.s
+++ b/llvm/test/MC/ARM/directive-arch-iwmmxt.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch iwmmxt
diff --git a/llvm/test/MC/ARM/directive-arch-iwmmxt2.s b/llvm/test/MC/ARM/directive-arch-iwmmxt2.s
index a4e59b5ba27..dec5abad8b7 100644
--- a/llvm/test/MC/ARM/directive-arch-iwmmxt2.s
+++ b/llvm/test/MC/ARM/directive-arch-iwmmxt2.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch iwmmxt2
diff --git a/llvm/test/MC/ARM/directive-cpu.s b/llvm/test/MC/ARM/directive-cpu.s
index d81a03e5e29..8c95d7b3d86 100644
--- a/llvm/test/MC/ARM/directive-cpu.s
+++ b/llvm/test/MC/ARM/directive-cpu.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ CHECK: Name: .ARM.attribute
@ CHECK: SectionData (
diff --git a/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s b/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s
index e2c50997275..b659cd2c285 100644
--- a/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s
+++ b/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/directive-eabi_attribute.s b/llvm/test/MC/ARM/directive-eabi_attribute.s
index e848f774b34..c25b0ae152a 100644
--- a/llvm/test/MC/ARM/directive-eabi_attribute.s
+++ b/llvm/test/MC/ARM/directive-eabi_attribute.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s --check-prefix=CHECK-OBJ
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/directive-even.s b/llvm/test/MC/ARM/directive-even.s
index b92c9f95f5d..e8152e5d20d 100644
--- a/llvm/test/MC/ARM/directive-even.s
+++ b/llvm/test/MC/ARM/directive-even.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -s -sd \
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -S --sd \
@ RUN: | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/directive-fpu-multiple.s b/llvm/test/MC/ARM/directive-fpu-multiple.s
index 50389a11532..eaa5af97f7a 100644
--- a/llvm/test/MC/ARM/directive-fpu-multiple.s
+++ b/llvm/test/MC/ARM/directive-fpu-multiple.s
@@ -3,7 +3,7 @@
@ The later .fpu directive should overwrite the earlier one.
@ We also check here that all the .fpu directives that we expect to work do work
-@ RUN: llvm-mc -triple arm-eabi -filetype obj %s | llvm-readobj -arm-attributes \
+@ RUN: llvm-mc -triple arm-eabi -filetype obj %s | llvm-readobj --arm-attributes \
@ RUN: | FileCheck %s -check-prefix CHECK-ATTR
.fpu none
diff --git a/llvm/test/MC/ARM/directive-fpu.s b/llvm/test/MC/ARM/directive-fpu.s
index 24e159c74fc..f7fea24edcb 100644
--- a/llvm/test/MC/ARM/directive-fpu.s
+++ b/llvm/test/MC/ARM/directive-fpu.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ CHECK: Name: .ARM.attribute
@ CHECK: SectionData (
diff --git a/llvm/test/MC/ARM/directive-object_arch-2.s b/llvm/test/MC/ARM/directive-object_arch-2.s
index f0596f12385..9f661182ffc 100644
--- a/llvm/test/MC/ARM/directive-object_arch-2.s
+++ b/llvm/test/MC/ARM/directive-object_arch-2.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/directive-object_arch.s b/llvm/test/MC/ARM/directive-object_arch.s
index c211a3bb57e..3b099408555 100644
--- a/llvm/test/MC/ARM/directive-object_arch.s
+++ b/llvm/test/MC/ARM/directive-object_arch.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/eh-compact-pr0.s b/llvm/test/MC/ARM/eh-compact-pr0.s
index 66fd4a4efed..c018c94bf4d 100644
--- a/llvm/test/MC/ARM/eh-compact-pr0.s
+++ b/llvm/test/MC/ARM/eh-compact-pr0.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-compact-pr1.s b/llvm/test/MC/ARM/eh-compact-pr1.s
index 9f40593cf43..d404a4f351b 100644
--- a/llvm/test/MC/ARM/eh-compact-pr1.s
+++ b/llvm/test/MC/ARM/eh-compact-pr1.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the compact pr1 model
diff --git a/llvm/test/MC/ARM/eh-directive-cantunwind.s b/llvm/test/MC/ARM/eh-directive-cantunwind.s
index 499c2c44dfc..60cbd852f6d 100644
--- a/llvm/test/MC/ARM/eh-directive-cantunwind.s
+++ b/llvm/test/MC/ARM/eh-directive-cantunwind.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the .cantunwind directive
diff --git a/llvm/test/MC/ARM/eh-directive-handlerdata.s b/llvm/test/MC/ARM/eh-directive-handlerdata.s
index c4352e5dee5..ce87b4b2d14 100644
--- a/llvm/test/MC/ARM/eh-directive-handlerdata.s
+++ b/llvm/test/MC/ARM/eh-directive-handlerdata.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-integrated-test.s b/llvm/test/MC/ARM/eh-directive-integrated-test.s
index df2b290fec9..d69d43a2625 100644
--- a/llvm/test/MC/ARM/eh-directive-integrated-test.s
+++ b/llvm/test/MC/ARM/eh-directive-integrated-test.s
@@ -20,7 +20,7 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@-------------------------------------------------------------------------------
diff --git a/llvm/test/MC/ARM/eh-directive-movsp.s b/llvm/test/MC/ARM/eh-directive-movsp.s
index 620f5b769d4..bbb9e2cfeb2 100644
--- a/llvm/test/MC/ARM/eh-directive-movsp.s
+++ b/llvm/test/MC/ARM/eh-directive-movsp.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -s -sd \
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -S --sd \
@ RUN: | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/eh-directive-multiple-offsets.s b/llvm/test/MC/ARM/eh-directive-multiple-offsets.s
index 6e81f41665a..25c40f94207 100644
--- a/llvm/test/MC/ARM/eh-directive-multiple-offsets.s
+++ b/llvm/test/MC/ARM/eh-directive-multiple-offsets.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check for different combination of .setfp, .pad, .save and .vsave.
diff --git a/llvm/test/MC/ARM/eh-directive-pad.s b/llvm/test/MC/ARM/eh-directive-pad.s
index f8263e6621f..ef6c34e8d18 100644
--- a/llvm/test/MC/ARM/eh-directive-pad.s
+++ b/llvm/test/MC/ARM/eh-directive-pad.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check for different stack pointer offsets.
diff --git a/llvm/test/MC/ARM/eh-directive-personality.s b/llvm/test/MC/ARM/eh-directive-personality.s
index 84e62bdfd68..826c10d696a 100644
--- a/llvm/test/MC/ARM/eh-directive-personality.s
+++ b/llvm/test/MC/ARM/eh-directive-personality.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-personalityindex.s b/llvm/test/MC/ARM/eh-directive-personalityindex.s
index 5d537bb04d3..36c0ac3882f 100644
--- a/llvm/test/MC/ARM/eh-directive-personalityindex.s
+++ b/llvm/test/MC/ARM/eh-directive-personalityindex.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-linux-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-save.s b/llvm/test/MC/ARM/eh-directive-save.s
index 652a7bb56c5..539d73d57a2 100644
--- a/llvm/test/MC/ARM/eh-directive-save.s
+++ b/llvm/test/MC/ARM/eh-directive-save.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check the .save directive
diff --git a/llvm/test/MC/ARM/eh-directive-section-comdat.s b/llvm/test/MC/ARM/eh-directive-section-comdat.s
index 8b7f32eaece..2ab5d8ccc9e 100644
--- a/llvm/test/MC/ARM/eh-directive-section-comdat.s
+++ b/llvm/test/MC/ARM/eh-directive-section-comdat.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -t | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr -t | FileCheck %s
@ Check the .group section for the function in comdat section.
diff --git a/llvm/test/MC/ARM/eh-directive-section-multiple-func.s b/llvm/test/MC/ARM/eh-directive-section-multiple-func.s
index 53c498ab87b..a75f9fe7bad 100644
--- a/llvm/test/MC/ARM/eh-directive-section-multiple-func.s
+++ b/llvm/test/MC/ARM/eh-directive-section-multiple-func.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -t > %t
+@ RUN: | llvm-readobj -S --sd --sr -t > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-section.s b/llvm/test/MC/ARM/eh-directive-section.s
index bd41fbe5eee..29d35662c9a 100644
--- a/llvm/test/MC/ARM/eh-directive-section.s
+++ b/llvm/test/MC/ARM/eh-directive-section.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -t > %t
+@ RUN: | llvm-readobj -S --sd --sr -t > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-setfp.s b/llvm/test/MC/ARM/eh-directive-setfp.s
index ce7fe10b43c..0d9d9e60076 100644
--- a/llvm/test/MC/ARM/eh-directive-setfp.s
+++ b/llvm/test/MC/ARM/eh-directive-setfp.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check for .setfp directive.
diff --git a/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s b/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s
index 7ab401c5043..4111984d2f6 100644
--- a/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s
+++ b/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -r -t | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr -r -t | FileCheck %s
@ Check whether the section is switched back or not.
diff --git a/llvm/test/MC/ARM/eh-directive-text-section.s b/llvm/test/MC/ARM/eh-directive-text-section.s
index 10ccdd54e50..b6658166365 100644
--- a/llvm/test/MC/ARM/eh-directive-text-section.s
+++ b/llvm/test/MC/ARM/eh-directive-text-section.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the .fnstart directive and the .fnend directive.
diff --git a/llvm/test/MC/ARM/eh-directive-vsave.s b/llvm/test/MC/ARM/eh-directive-vsave.s
index c9b78d7e276..1b792650866 100644
--- a/llvm/test/MC/ARM/eh-directive-vsave.s
+++ b/llvm/test/MC/ARM/eh-directive-vsave.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the .vsave directive
diff --git a/llvm/test/MC/ARM/eh-link.s b/llvm/test/MC/ARM/eh-link.s
index 19fe14db5f3..bae17d3e3c8 100644
--- a/llvm/test/MC/ARM/eh-link.s
+++ b/llvm/test/MC/ARM/eh-link.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s | FileCheck %s
+@ RUN: | llvm-readobj -S | FileCheck %s
@ Test that the ARM_EXIDX sections point (Link) to the corresponding text
@ sections.
diff --git a/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s b/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s
index 18c13d90332..3136ad98e85 100644
--- a/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s
+++ b/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc %s -triple=thumbv7-linux-gnueabi \
-// RUN: -filetype=obj -o - | llvm-readobj -s -sd -r -t | \
+// RUN: -filetype=obj -o - | llvm-readobj -S --sd -r -t | \
// RUN: FileCheck %s
// We want to test relocatable thumb function call.
diff --git a/llvm/test/MC/ARM/inst-directive.s b/llvm/test/MC/ARM/inst-directive.s
index d3f2a36408c..290bd7d029e 100644
--- a/llvm/test/MC/ARM/inst-directive.s
+++ b/llvm/test/MC/ARM/inst-directive.s
@@ -1,8 +1,8 @@
@ RUN: llvm-mc %s -triple=armv7-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LE
+@ RUN: | llvm-readobj -S --sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LE
@ RUN: llvm-mc %s -triple=armebv7-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE
+@ RUN: | llvm-readobj -S --sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE
.syntax unified
diff --git a/llvm/test/MC/ARM/mappingsymbols.s b/llvm/test/MC/ARM/mappingsymbols.s
index fff8e104781..3727e3ef7f2 100644
--- a/llvm/test/MC/ARM/mappingsymbols.s
+++ b/llvm/test/MC/ARM/mappingsymbols.s
@@ -1,40 +1,40 @@
# Check section containing code and data with permission executable for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/1.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
# Check section containing code and data with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/2.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
# Check section containing code and data with read/write permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/3.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
# Check section containing data with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/4.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing only data with read/write permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/5.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing the ident string with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/ident.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing the attributes with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/attr.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing code and data with no permissions for the section.
# data comes before code.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/6.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MIX
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MIX
# Check section containing code and data with no permissions for the section.
# data comes before code.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/7.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
#CHECK: $a
#CHECK: $d
diff --git a/llvm/test/MC/AsmParser/section.s b/llvm/test/MC/AsmParser/section.s
index 2ef545b822c..e46acee0f0a 100644
--- a/llvm/test/MC/AsmParser/section.s
+++ b/llvm/test/MC/AsmParser/section.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple i386-pc-linux-gnu -filetype=obj -o %t %s
-# RUN: llvm-readobj -s -sd < %t | FileCheck %s
+# RUN: llvm-readobj -S --sd < %t | FileCheck %s
.section test1
.byte 1
.section test2
diff --git a/llvm/test/MC/AsmParser/section_names.s b/llvm/test/MC/AsmParser/section_names.s
index 38a5310099d..8d16c4fb307 100644
--- a/llvm/test/MC/AsmParser/section_names.s
+++ b/llvm/test/MC/AsmParser/section_names.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple i386-pc-linux-gnu -filetype=obj -o %t %s
-# RUN: llvm-readobj -s < %t | FileCheck %s
+# RUN: llvm-readobj -S < %t | FileCheck %s
.section .nobits
.byte 1
.section .nobits2
diff --git a/llvm/test/MC/COFF/addrsig.s b/llvm/test/MC/COFF/addrsig.s
index 815102ed88f..938c18f61bf 100644
--- a/llvm/test/MC/COFF/addrsig.s
+++ b/llvm/test/MC/COFF/addrsig.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -s -t -sd -addrsig | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -S -t --sd --addrsig | FileCheck %s
// CHECK: Name: .llvm_addrsig
// CHECK-NEXT: VirtualSize: 0x0
diff --git a/llvm/test/MC/COFF/align-nops.s b/llvm/test/MC/COFF/align-nops.s
index 6d23721ed77..e9610397492 100644
--- a/llvm/test/MC/COFF/align-nops.s
+++ b/llvm/test/MC/COFF/align-nops.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 -mcpu=pentiumpro %s | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 -mcpu=pentiumpro %s | llvm-readobj -S --sd | FileCheck %s
// Test that we get optimal nops in text
.text
diff --git a/llvm/test/MC/COFF/basic-coff-64.s b/llvm/test/MC/COFF/basic-coff-64.s
index 5fe710fdba4..2457e139295 100644
--- a/llvm/test/MC/COFF/basic-coff-64.s
+++ b/llvm/test/MC/COFF/basic-coff-64.s
@@ -1,7 +1,7 @@
// This test checks that the COFF object emitter works for the most basic
// programs.
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/basic-coff.s b/llvm/test/MC/COFF/basic-coff.s
index 575a937c957..7ad61308d94 100644
--- a/llvm/test/MC/COFF/basic-coff.s
+++ b/llvm/test/MC/COFF/basic-coff.s
@@ -1,7 +1,7 @@
// This test checks that the COFF object emitter works for the most basic
// programs.
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/bss.s b/llvm/test/MC/COFF/bss.s
index 17ae0daa1c3..d707703a4c4 100644
--- a/llvm/test/MC/COFF/bss.s
+++ b/llvm/test/MC/COFF/bss.s
@@ -1,7 +1,7 @@
// The purpose of this test is to verify that bss sections are emitted correctly.
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -S | FileCheck %s
.bss
.globl _g0
diff --git a/llvm/test/MC/COFF/comm-align.s b/llvm/test/MC/COFF/comm-align.s
index ca6bfbea247..048d92e614f 100644
--- a/llvm/test/MC/COFF/comm-align.s
+++ b/llvm/test/MC/COFF/comm-align.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple i686-windows-gnu -filetype obj -o - %s \
-# RUN: | llvm-readobj -coff-directives -symbols | FileCheck %s
+# RUN: | llvm-readobj --coff-directives --symbols | FileCheck %s
# NOTE: this test checks multiple things:
# - that -aligncomm is not emitted for 1-byte alignment
diff --git a/llvm/test/MC/COFF/cross-section-relative.s b/llvm/test/MC/COFF/cross-section-relative.s
index a9b7e6dbd5d..c448575891d 100644
--- a/llvm/test/MC/COFF/cross-section-relative.s
+++ b/llvm/test/MC/COFF/cross-section-relative.s
@@ -1,5 +1,5 @@
// Verify the .fix data section conveys the right offsets and the right relocations
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -relocations -expand-relocs -sections -section-data | FileCheck %s --check-prefix=READOBJ
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -r --expand-relocs -S --section-data | FileCheck %s --check-prefix=READOBJ
.text
.section .rdata,"dr"
diff --git a/llvm/test/MC/COFF/cv-def-range-gap.s b/llvm/test/MC/COFF/cv-def-range-gap.s
index 2a1a179b430..877eaeef7e4 100644
--- a/llvm/test/MC/COFF/cv-def-range-gap.s
+++ b/llvm/test/MC/COFF/cv-def-range-gap.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# This tries to test defrange gap edge cases.
diff --git a/llvm/test/MC/COFF/cv-def-range.s b/llvm/test/MC/COFF/cv-def-range.s
index 7afdac23ea6..cbd62f3fe3b 100644
--- a/llvm/test/MC/COFF/cv-def-range.s
+++ b/llvm/test/MC/COFF/cv-def-range.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview -codeview-subsection-bytes | FileCheck %s
+# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview --codeview-subsection-bytes | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-empty-file-table.s b/llvm/test/MC/COFF/cv-empty-file-table.s
index 157cd3167d2..2cde1558346 100644
--- a/llvm/test/MC/COFF/cv-empty-file-table.s
+++ b/llvm/test/MC/COFF/cv-empty-file-table.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj -codeview - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj --codeview - | FileCheck %s
.text
.section .debug$S,"dr"
.p2align 2
diff --git a/llvm/test/MC/COFF/cv-empty-linetable.s b/llvm/test/MC/COFF/cv-empty-linetable.s
index 865bc7556be..61ba57ad108 100644
--- a/llvm/test/MC/COFF/cv-empty-linetable.s
+++ b/llvm/test/MC/COFF/cv-empty-linetable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj -codeview - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj --codeview - | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-fpo-csrs.s b/llvm/test/MC/COFF/cv-fpo-csrs.s
index 4235958d66f..1741143ce14 100644
--- a/llvm/test/MC/COFF/cv-fpo-csrs.s
+++ b/llvm/test/MC/COFF/cv-fpo-csrs.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=asm < %s -triple i686-windows-msvc | FileCheck %s --check-prefix=ASM
-# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ
+# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ
.globl _foo
_foo:
diff --git a/llvm/test/MC/COFF/cv-fpo-realign.s b/llvm/test/MC/COFF/cv-fpo-realign.s
index 247cad9334b..df94b133acd 100644
--- a/llvm/test/MC/COFF/cv-fpo-realign.s
+++ b/llvm/test/MC/COFF/cv-fpo-realign.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-windows-msvc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=i686-windows-msvc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# Test for .cv_fpo_stackalign. We should generate FPO data that restores CSRs
# at each instruction, and in the last FrameData we should use the '@'
diff --git a/llvm/test/MC/COFF/cv-fpo-setframe.s b/llvm/test/MC/COFF/cv-fpo-setframe.s
index 229a4e92320..217248210ce 100644
--- a/llvm/test/MC/COFF/cv-fpo-setframe.s
+++ b/llvm/test/MC/COFF/cv-fpo-setframe.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=asm < %s -triple i686-windows-msvc | FileCheck %s --check-prefix=ASM
-# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ
+# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ
.globl _foo
_foo:
diff --git a/llvm/test/MC/COFF/cv-inline-linetable-infloop.s b/llvm/test/MC/COFF/cv-inline-linetable-infloop.s
index 6b8e708befc..3f5f1f53898 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable-infloop.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable-infloop.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# CHECK: InlineSiteSym {
# CHECK: BinaryAnnotations [
diff --git a/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s b/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s
index bfb745bd9bb..0ad3559beb7 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-windows -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=x86_64-windows -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# C source to generate the assembly:
# volatile int unlikely_cond = 0;
diff --git a/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s b/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s
index ab184602c86..b76028e0abf 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-inline-linetable.s b/llvm/test/MC/COFF/cv-inline-linetable.s
index c5e28c4d078..460c2e9ba2a 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-loc-unreachable-2.s b/llvm/test/MC/COFF/cv-loc-unreachable-2.s
index 15b3038001e..be96e82fa1b 100644
--- a/llvm/test/MC/COFF/cv-loc-unreachable-2.s
+++ b/llvm/test/MC/COFF/cv-loc-unreachable-2.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s
+# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s
# Based on the other cv-loc-unreachable-2.s, but with other code in the same
# section afterwards. We had negative label difference assertions when .cv_loc
diff --git a/llvm/test/MC/COFF/cv-loc-unreachable.s b/llvm/test/MC/COFF/cv-loc-unreachable.s
index de270690adb..945e519f506 100644
--- a/llvm/test/MC/COFF/cv-loc-unreachable.s
+++ b/llvm/test/MC/COFF/cv-loc-unreachable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s
+# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s
# Original source, slightly modified with an extra .cv_loc directive (at EXTRA
# below) that was causing assertions:
diff --git a/llvm/test/MC/COFF/cv-loc.s b/llvm/test/MC/COFF/cv-loc.s
index 01d5d02b224..d2e1bba5232 100644
--- a/llvm/test/MC/COFF/cv-loc.s
+++ b/llvm/test/MC/COFF/cv-loc.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s
+# RUN: llvm-mc < %s -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s
.section .debug$S
.long 4
diff --git a/llvm/test/MC/COFF/cv-string.s b/llvm/test/MC/COFF/cv-string.s
index b3b670c48e9..e9f2631a374 100644
--- a/llvm/test/MC/COFF/cv-string.s
+++ b/llvm/test/MC/COFF/cv-string.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple=i686-windows-msvc %s -filetype=obj -o %t.obj
-# RUN: llvm-readobj -codeview %t.obj | FileCheck %s
+# RUN: llvm-readobj --codeview %t.obj | FileCheck %s
# The .cv_string directive mainly exists as a convenience for manually writing
# FPO data in assembler. Test that we can write FPO data using this directive,
diff --git a/llvm/test/MC/COFF/diff.s b/llvm/test/MC/COFF/diff.s
index f89e4ed8901..2fb48ccc4ee 100644
--- a/llvm/test/MC/COFF/diff.s
+++ b/llvm/test/MC/COFF/diff.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-mingw32 %s | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-mingw32 %s | llvm-readobj -S --sr --sd | FileCheck %s
// COFF resolves differences between labels in the same section, unless that
// label is declared with function type.
diff --git a/llvm/test/MC/COFF/directive-section-characteristics.ll b/llvm/test/MC/COFF/directive-section-characteristics.ll
index eed2dbf598e..d47103f22cc 100644
--- a/llvm/test/MC/COFF/directive-section-characteristics.ll
+++ b/llvm/test/MC/COFF/directive-section-characteristics.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple i686-windows -filetype obj -o - %s | llvm-readobj -sections \
+; RUN: llc -mtriple i686-windows -filetype obj -o - %s | llvm-readobj --sections \
; RUN: | FileCheck %s
define dllexport void @function() {
diff --git a/llvm/test/MC/COFF/early-dce.s b/llvm/test/MC/COFF/early-dce.s
index ec1a9bda76f..19788390c20 100644
--- a/llvm/test/MC/COFF/early-dce.s
+++ b/llvm/test/MC/COFF/early-dce.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple i686-windows -g -filetype obj -o - %s \
-# RUN: | llvm-readobj -s -t | FileCheck %s
+# RUN: | llvm-readobj -S -t | FileCheck %s
.section .rdata
diff --git a/llvm/test/MC/COFF/eh-frame.s b/llvm/test/MC/COFF/eh-frame.s
index 2c5ff202dc6..e51b4c04410 100644
--- a/llvm/test/MC/COFF/eh-frame.s
+++ b/llvm/test/MC/COFF/eh-frame.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o - | llvm-readobj -S | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/file.s b/llvm/test/MC/COFF/file.s
index dbe3b024f6c..96a658c073b 100644
--- a/llvm/test/MC/COFF/file.s
+++ b/llvm/test/MC/COFF/file.s
@@ -7,7 +7,7 @@
// RUN: | FileCheck %s
// RUN: llvm-mc -triple i686-windows -filetype obj %s -o - \
-// RUN: | llvm-readobj -symbols | FileCheck %s -check-prefix CHECK-SCN
+// RUN: | llvm-readobj --symbols | FileCheck %s -check-prefix CHECK-SCN
.file "null-padded.asm"
// CHECK: (nx 1) {{0x[0-9]+}} .file
diff --git a/llvm/test/MC/COFF/linkonce.s b/llvm/test/MC/COFF/linkonce.s
index f2e350645bf..d490aa778ed 100644
--- a/llvm/test/MC/COFF/linkonce.s
+++ b/llvm/test/MC/COFF/linkonce.s
@@ -1,7 +1,7 @@
// Test section manipulation via .linkonce directive.
//
-// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
+// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
.section s1
.linkonce
diff --git a/llvm/test/MC/COFF/module-asm.ll b/llvm/test/MC/COFF/module-asm.ll
index bf14dc695b5..900694e0532 100644
--- a/llvm/test/MC/COFF/module-asm.ll
+++ b/llvm/test/MC/COFF/module-asm.ll
@@ -1,8 +1,8 @@
; The purpose of this test is to verify that various module level assembly
; constructs work.
-; RUN: llc -filetype=obj -mtriple i686-pc-win32 %s -o - | llvm-readobj -s -sd | FileCheck %s
-; RUN: llc -filetype=obj -mtriple x86_64-pc-win32 %s -o - | llvm-readobj -s -sd | FileCheck %s
+; RUN: llc -filetype=obj -mtriple i686-pc-win32 %s -o - | llvm-readobj -S --sd | FileCheck %s
+; RUN: llc -filetype=obj -mtriple x86_64-pc-win32 %s -o - | llvm-readobj -S --sd | FileCheck %s
module asm ".text"
module asm "_foo:"
diff --git a/llvm/test/MC/COFF/pr28462.s b/llvm/test/MC/COFF/pr28462.s
index 271963d01c5..4289d7b2abb 100644
--- a/llvm/test/MC/COFF/pr28462.s
+++ b/llvm/test/MC/COFF/pr28462.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-windows-msvc < %s | llvm-readobj -s --section-data | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-windows-msvc < %s | llvm-readobj -S --section-data | FileCheck %s
.text
.set var, 42
diff --git a/llvm/test/MC/COFF/secidx.s b/llvm/test/MC/COFF/secidx.s
index 022804d8219..736cb8c80a8 100644
--- a/llvm/test/MC/COFF/secidx.s
+++ b/llvm/test/MC/COFF/secidx.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s -sr | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S --sr | FileCheck %s
// check that we produce the correct relocation for .secidx
diff --git a/llvm/test/MC/COFF/secrel32-undef.s b/llvm/test/MC/COFF/secrel32-undef.s
index 3a725ab8950..70db082b053 100644
--- a/llvm/test/MC/COFF/secrel32-undef.s
+++ b/llvm/test/MC/COFF/secrel32-undef.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o %t.obj
-# RUN: llvm-readobj -symbols -relocations %t.obj | FileCheck %s
+# RUN: llvm-readobj --symbols -r %t.obj | FileCheck %s
# Previously .secrel32 and .secidx relocations against undefined symbols
# resulted in an error. That was a mistake. The linker is fully capable of
diff --git a/llvm/test/MC/COFF/secrel32.s b/llvm/test/MC/COFF/secrel32.s
index deadfe09e0e..d3d59f750f0 100644
--- a/llvm/test/MC/COFF/secrel32.s
+++ b/llvm/test/MC/COFF/secrel32.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s -sr | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S --sr | FileCheck %s
// check that we produce the correct relocation for .secrel32
diff --git a/llvm/test/MC/COFF/section-comdat.s b/llvm/test/MC/COFF/section-comdat.s
index 923c23ab95a..d4681d5388f 100644
--- a/llvm/test/MC/COFF/section-comdat.s
+++ b/llvm/test/MC/COFF/section-comdat.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
+// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
.section assocSec, "dr", discard, "assocSym"
.global assocSym
diff --git a/llvm/test/MC/COFF/section-name-encoding.s b/llvm/test/MC/COFF/section-name-encoding.s
index 73ab4bdb770..09dd02000c3 100644
--- a/llvm/test/MC/COFF/section-name-encoding.s
+++ b/llvm/test/MC/COFF/section-name-encoding.s
@@ -5,7 +5,7 @@
// (8, 999999]: base 10 string table index (/9999999)
// (999999, 0xFFFFFFFF]: base 64 string table index (//AAAAAA)
//
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s
// Raw encoding
diff --git a/llvm/test/MC/COFF/section.s b/llvm/test/MC/COFF/section.s
index 409c6446cb4..b7b5422babd 100644
--- a/llvm/test/MC/COFF/section.s
+++ b/llvm/test/MC/COFF/section.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s
.section .foo$bar; .long 1
.section .foo@bar; .long 1
diff --git a/llvm/test/MC/COFF/seh-align1.s b/llvm/test/MC/COFF/seh-align1.s
index aafc6ede085..09ee7697c4f 100644
--- a/llvm/test/MC/COFF/seh-align1.s
+++ b/llvm/test/MC/COFF/seh-align1.s
@@ -1,6 +1,6 @@
// This test checks the alignment and padding of the unwind info.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/seh-align2.s b/llvm/test/MC/COFF/seh-align2.s
index 5e6c49a720c..fab1c30d0e5 100644
--- a/llvm/test/MC/COFF/seh-align2.s
+++ b/llvm/test/MC/COFF/seh-align2.s
@@ -1,6 +1,6 @@
// This test checks the alignment and padding of the unwind info.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/seh-align3.s b/llvm/test/MC/COFF/seh-align3.s
index 238b5de3564..34a2fe3aef7 100644
--- a/llvm/test/MC/COFF/seh-align3.s
+++ b/llvm/test/MC/COFF/seh-align3.s
@@ -1,6 +1,6 @@
// This test checks the alignment and padding of the unwind info.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/seh-linkonce.s b/llvm/test/MC/COFF/seh-linkonce.s
index 3352d68b3cf..9cd37bb90d4 100644
--- a/llvm/test/MC/COFF/seh-linkonce.s
+++ b/llvm/test/MC/COFF/seh-linkonce.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -sections -section-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj --sections --section-symbols | FileCheck %s
.text
.def weak_func;
diff --git a/llvm/test/MC/COFF/seh-section-2.s b/llvm/test/MC/COFF/seh-section-2.s
index 650c5b5105b..b9105829648 100644
--- a/llvm/test/MC/COFF/seh-section-2.s
+++ b/llvm/test/MC/COFF/seh-section-2.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -symbols | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj --symbols | FileCheck %s
# This assembly should make an object with two .text sections, two .xdata
# sections, and two .pdata sections.
diff --git a/llvm/test/MC/COFF/seh-section.s b/llvm/test/MC/COFF/seh-section.s
index 711b3eaccef..7d3609d327a 100644
--- a/llvm/test/MC/COFF/seh-section.s
+++ b/llvm/test/MC/COFF/seh-section.s
@@ -1,6 +1,6 @@
// This test ensures functions in custom sections get unwind info emitted in a
// distinct .xdata section.
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -S --sd | FileCheck %s
// CHECK: Name: .xdata
// CHECK-NEXT: VirtualSize
diff --git a/llvm/test/MC/COFF/seh.s b/llvm/test/MC/COFF/seh.s
index cd884b4fa00..959ac6413d3 100644
--- a/llvm/test/MC/COFF/seh.s
+++ b/llvm/test/MC/COFF/seh.s
@@ -1,6 +1,6 @@
// This test checks that the SEH directives emit the correct unwind data.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -u -r | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -u -r | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/simple-fixups.s b/llvm/test/MC/COFF/simple-fixups.s
index c1556afb5c0..77dd47b3059 100644
--- a/llvm/test/MC/COFF/simple-fixups.s
+++ b/llvm/test/MC/COFF/simple-fixups.s
@@ -2,8 +2,8 @@
// references to functions. Failing to do so might cause pointer-to-function
// equality to fail if /INCREMENTAL links are used.
-// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple i686-pc-win32 %s | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple x86_64-pc-win32 %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple i686-pc-win32 %s | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple x86_64-pc-win32 %s | llvm-readobj -S | FileCheck %s
.def _foo;
.scl 2;
diff --git a/llvm/test/MC/COFF/symbol-fragment-offset-64.s b/llvm/test/MC/COFF/symbol-fragment-offset-64.s
index 94e7d07965b..0e86aaa0227 100644
--- a/llvm/test/MC/COFF/symbol-fragment-offset-64.s
+++ b/llvm/test/MC/COFF/symbol-fragment-offset-64.s
@@ -1,7 +1,7 @@
// The purpose of this test is to see if the COFF object writer is emitting the
// proper relocations for multiple pieces of data in a single data fragment.
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/symbol-fragment-offset.s b/llvm/test/MC/COFF/symbol-fragment-offset.s
index 5875bf47f92..2784768168e 100644
--- a/llvm/test/MC/COFF/symbol-fragment-offset.s
+++ b/llvm/test/MC/COFF/symbol-fragment-offset.s
@@ -1,7 +1,7 @@
// The purpose of this test is to see if the COFF object writer is emitting the
// proper relocations for multiple pieces of data in a single data fragment.
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/ELF/ARM/clang-section.s b/llvm/test/MC/ELF/ARM/clang-section.s
index 0018cfe13d1..c536507faa8 100644
--- a/llvm/test/MC/ELF/ARM/clang-section.s
+++ b/llvm/test/MC/ELF/ARM/clang-section.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple arm-eabi %s -o - | llvm-readobj -s -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple arm-eabi %s -o - | llvm-readobj -S -t | FileCheck %s
// Test that global variables and functions are assigned correct section.
.text
.syntax unified
diff --git a/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s b/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s
index 26a9c499f89..575f1e4c5f4 100644
--- a/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s
+++ b/llvm/test/MC/ELF/ARM/execute-only-populated-text-section.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple thumbv7m-arm-linux-gnu %s -o - \
-// RUN: | llvm-readobj -s -t | FileCheck %s
+// RUN: | llvm-readobj -S -t | FileCheck %s
.text
bx lr
diff --git a/llvm/test/MC/ELF/ARM/execute-only-section.s b/llvm/test/MC/ELF/ARM/execute-only-section.s
index 524ba8ac687..6f7e459c24b 100644
--- a/llvm/test/MC/ELF/ARM/execute-only-section.s
+++ b/llvm/test/MC/ELF/ARM/execute-only-section.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple thumbv7m-arm-linux-gnu %s -o - \
-// RUN: | llvm-readobj -s -t | FileCheck %s
+// RUN: | llvm-readobj -S -t | FileCheck %s
.section .text,"axy",%progbits,unique,0
.globl foo
diff --git a/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s b/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s
index 3e9abca34a2..24086e2b13b 100644
--- a/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s
+++ b/llvm/test/MC/ELF/ARM/execute-only-text-section-data.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple thumbv7m-arm-linux-gnu %s -o - \
-// RUN: | llvm-readobj -s -t | FileCheck %s
+// RUN: | llvm-readobj -S -t | FileCheck %s
.text
.ascii "test"
diff --git a/llvm/test/MC/ELF/addrsig.s b/llvm/test/MC/ELF/addrsig.s
index 9e626c889f2..997ad0b3112 100644
--- a/llvm/test/MC/ELF/addrsig.s
+++ b/llvm/test/MC/ELF/addrsig.s
@@ -1,7 +1,7 @@
// RUN: llvm-mc -filetype=asm -triple x86_64-pc-linux-gnu %s -o - | FileCheck --check-prefix=ASM %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -sd -addrsig | FileCheck %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -split-dwarf-file %t.dwo -o - | llvm-readobj -s -t -sd -addrsig | FileCheck %s
-// RUN: llvm-readobj -s %t.dwo | FileCheck --check-prefix=DWO %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t --sd --addrsig | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -split-dwarf-file %t.dwo -o - | llvm-readobj -S -t --sd --addrsig | FileCheck %s
+// RUN: llvm-readobj -S %t.dwo | FileCheck --check-prefix=DWO %s
// CHECK: Name: .llvm_addrsig
// CHECK-NEXT: Type: SHT_LLVM_ADDRSIG (0x6FFF4C03)
diff --git a/llvm/test/MC/ELF/align-bss.s b/llvm/test/MC/ELF/align-bss.s
index 776eef38467..1a9191c34ef 100644
--- a/llvm/test/MC/ELF/align-bss.s
+++ b/llvm/test/MC/ELF/align-bss.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test that the bss section is correctly aligned
diff --git a/llvm/test/MC/ELF/align-nops.s b/llvm/test/MC/ELF/align-nops.s
index 32da3dbd8e8..08e8660e4e8 100644
--- a/llvm/test/MC/ELF/align-nops.s
+++ b/llvm/test/MC/ELF/align-nops.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -mcpu=pentiumpro %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -mcpu=pentiumpro %s -o - | llvm-readobj -S --sd | FileCheck %s
// Test that we get optimal nops in text
.text
diff --git a/llvm/test/MC/ELF/align-size.s b/llvm/test/MC/ELF/align-size.s
index 84a6e998148..2f5e74d1192 100644
--- a/llvm/test/MC/ELF/align-size.s
+++ b/llvm/test/MC/ELF/align-size.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test that the alignment does contribute to the size of the section.
diff --git a/llvm/test/MC/ELF/align-text.s b/llvm/test/MC/ELF/align-text.s
index b00af4a34b0..278102e26e3 100644
--- a/llvm/test/MC/ELF/align-text.s
+++ b/llvm/test/MC/ELF/align-text.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test that the .text directive doesn't cause alignment.
diff --git a/llvm/test/MC/ELF/align.s b/llvm/test/MC/ELF/align.s
index 7e78298540f..27c97980e9d 100644
--- a/llvm/test/MC/ELF/align.s
+++ b/llvm/test/MC/ELF/align.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test that the alignment of rodata doesn't force a alignment of the
// previous section (.text)
diff --git a/llvm/test/MC/ELF/basic-elf-32.s b/llvm/test/MC/ELF/basic-elf-32.s
index d4aab27d29c..4a2ac7a24b1 100644
--- a/llvm/test/MC/ELF/basic-elf-32.s
+++ b/llvm/test/MC/ELF/basic-elf-32.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -h -s -r -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -h -S -r -t | FileCheck %s
.text
.globl main
diff --git a/llvm/test/MC/ELF/basic-elf-64.s b/llvm/test/MC/ELF/basic-elf-64.s
index ae0903ec8cd..dbe09ca0ce8 100644
--- a/llvm/test/MC/ELF/basic-elf-64.s
+++ b/llvm/test/MC/ELF/basic-elf-64.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -h -s -r -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -h -S -r -t | FileCheck %s
.text
.globl main
diff --git a/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s b/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s
index 7177ccb3650..e935dcbefc4 100644
--- a/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s
+++ b/llvm/test/MC/ELF/cfi-adjust-cfa-offset.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-advance-loc2.s b/llvm/test/MC/ELF/cfi-advance-loc2.s
index 6a60e52acba..aa5f9ddcbf4 100644
--- a/llvm/test/MC/ELF/cfi-advance-loc2.s
+++ b/llvm/test/MC/ELF/cfi-advance-loc2.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
// test that this produces a correctly encoded cfi_advance_loc2
diff --git a/llvm/test/MC/ELF/cfi-def-cfa-offset.s b/llvm/test/MC/ELF/cfi-def-cfa-offset.s
index c4cc6d53e02..5b71c64555a 100644
--- a/llvm/test/MC/ELF/cfi-def-cfa-offset.s
+++ b/llvm/test/MC/ELF/cfi-def-cfa-offset.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-def-cfa-register.s b/llvm/test/MC/ELF/cfi-def-cfa-register.s
index 708f6b1496e..220e3cba08f 100644
--- a/llvm/test/MC/ELF/cfi-def-cfa-register.s
+++ b/llvm/test/MC/ELF/cfi-def-cfa-register.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-def-cfa.s b/llvm/test/MC/ELF/cfi-def-cfa.s
index 25931b77ec6..67aa3a65fef 100644
--- a/llvm/test/MC/ELF/cfi-def-cfa.s
+++ b/llvm/test/MC/ELF/cfi-def-cfa.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-escape.s b/llvm/test/MC/ELF/cfi-escape.s
index fb019be1252..620d1538716 100644
--- a/llvm/test/MC/ELF/cfi-escape.s
+++ b/llvm/test/MC/ELF/cfi-escape.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-large-model.s b/llvm/test/MC/ELF/cfi-large-model.s
index 5883164a28f..444f38af029 100644
--- a/llvm/test/MC/ELF/cfi-large-model.s
+++ b/llvm/test/MC/ELF/cfi-large-model.s
@@ -1,9 +1,9 @@
// REQUIRES: powerpc-registered-target
// REQUIRES: x86-registered-target
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -large-code-model %s \
-// RUN: -o - | llvm-readobj -s -sd | FileCheck --check-prefix=CHECK-X86 %s
+// RUN: -o - | llvm-readobj -S --sd | FileCheck --check-prefix=CHECK-X86 %s
// RUN: llvm-mc -filetype=obj -triple powerpc64le-linux-gnu -large-code-model %s \
-// RUN: -o - | llvm-readobj -s -sd | FileCheck --check-prefix=CHECK-PPC %s
+// RUN: -o - | llvm-readobj -S --sd | FileCheck --check-prefix=CHECK-PPC %s
// CHECK-X86: Section {
diff --git a/llvm/test/MC/ELF/cfi-offset.s b/llvm/test/MC/ELF/cfi-offset.s
index ea9d0f49915..be571b4a49b 100644
--- a/llvm/test/MC/ELF/cfi-offset.s
+++ b/llvm/test/MC/ELF/cfi-offset.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-register.s b/llvm/test/MC/ELF/cfi-register.s
index f7c021d06b8..89400cd9a78 100644
--- a/llvm/test/MC/ELF/cfi-register.s
+++ b/llvm/test/MC/ELF/cfi-register.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-rel-offset.s b/llvm/test/MC/ELF/cfi-rel-offset.s
index 89ca4ff148a..1c877b3e293 100644
--- a/llvm/test/MC/ELF/cfi-rel-offset.s
+++ b/llvm/test/MC/ELF/cfi-rel-offset.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-rel-offset2.s b/llvm/test/MC/ELF/cfi-rel-offset2.s
index e4d6b58c748..34a667c3091 100644
--- a/llvm/test/MC/ELF/cfi-rel-offset2.s
+++ b/llvm/test/MC/ELF/cfi-rel-offset2.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-remember.s b/llvm/test/MC/ELF/cfi-remember.s
index c438ad3d0f3..d1629d1a508 100644
--- a/llvm/test/MC/ELF/cfi-remember.s
+++ b/llvm/test/MC/ELF/cfi-remember.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-restore.s b/llvm/test/MC/ELF/cfi-restore.s
index eb968fecbc4..79be928e72a 100644
--- a/llvm/test/MC/ELF/cfi-restore.s
+++ b/llvm/test/MC/ELF/cfi-restore.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-same-value.s b/llvm/test/MC/ELF/cfi-same-value.s
index 7d744ab5963..dc343999944 100644
--- a/llvm/test/MC/ELF/cfi-same-value.s
+++ b/llvm/test/MC/ELF/cfi-same-value.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-sections.s b/llvm/test/MC/ELF/cfi-sections.s
index 830fe260ec2..ea22eb6e1d1 100644
--- a/llvm/test/MC/ELF/cfi-sections.s
+++ b/llvm/test/MC/ELF/cfi-sections.s
@@ -1,11 +1,11 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_2 %s
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_2 %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_2 %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 2 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_2 %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_3 %s
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_3 %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_3 %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 3 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_3 %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_4 %s
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_4 %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 -check-prefix=ELF_64_DWARF_4 %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu -dwarf-version 4 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 -check-prefix=ELF_32_DWARF_4 %s
.cfi_sections .debug_frame
diff --git a/llvm/test/MC/ELF/cfi-signal-frame.s b/llvm/test/MC/ELF/cfi-signal-frame.s
index 63244f3fc3e..17d3f6afbf0 100644
--- a/llvm/test/MC/ELF/cfi-signal-frame.s
+++ b/llvm/test/MC/ELF/cfi-signal-frame.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-undefined.s b/llvm/test/MC/ELF/cfi-undefined.s
index 50c482df79e..dc615bd02bb 100644
--- a/llvm/test/MC/ELF/cfi-undefined.s
+++ b/llvm/test/MC/ELF/cfi-undefined.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cfi-window-save.s b/llvm/test/MC/ELF/cfi-window-save.s
index 01d7ef43378..7eb3ae2f98e 100644
--- a/llvm/test/MC/ELF/cfi-window-save.s
+++ b/llvm/test/MC/ELF/cfi-window-save.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
# Should use SPARC as the target to test this. However, SPARC does not
# use MC yet.
diff --git a/llvm/test/MC/ELF/cfi-zero-addr-delta.s b/llvm/test/MC/ELF/cfi-zero-addr-delta.s
index 495d52c234d..81d16987d58 100644
--- a/llvm/test/MC/ELF/cfi-zero-addr-delta.s
+++ b/llvm/test/MC/ELF/cfi-zero-addr-delta.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
// Test that we don't produce a DW_CFA_advance_loc 0
diff --git a/llvm/test/MC/ELF/cfi.s b/llvm/test/MC/ELF/cfi.s
index abc987d407d..b11cd8a00b2 100644
--- a/llvm/test/MC/ELF/cfi.s
+++ b/llvm/test/MC/ELF/cfi.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr --sd | FileCheck %s
f1:
.cfi_startproc
diff --git a/llvm/test/MC/ELF/cgprofile.ll b/llvm/test/MC/ELF/cgprofile.ll
index ec8ec507996..bd437c3f3ec 100644
--- a/llvm/test/MC/ELF/cgprofile.ll
+++ b/llvm/test/MC/ELF/cgprofile.ll
@@ -1,6 +1,6 @@
; RUN: llc -filetype=asm %s -o - -mtriple x86_64-pc-linux-gnu | FileCheck %s
; RUN: llc -filetype=obj %s -o %t -mtriple x86_64-pc-linux-gnu
-; RUN: llvm-readobj -elf-cg-profile %t | FileCheck %s --check-prefix=OBJ
+; RUN: llvm-readobj --elf-cg-profile %t | FileCheck %s --check-prefix=OBJ
declare void @b()
diff --git a/llvm/test/MC/ELF/cgprofile.s b/llvm/test/MC/ELF/cgprofile.s
index 5b5b7fac855..5b16176e21d 100644
--- a/llvm/test/MC/ELF/cgprofile.s
+++ b/llvm/test/MC/ELF/cgprofile.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -sd -elf-cg-profile | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t --sd --elf-cg-profile | FileCheck %s
.section .test,"aw",@progbits
a: .word b
diff --git a/llvm/test/MC/ELF/comdat-dup-group-name.s b/llvm/test/MC/ELF/comdat-dup-group-name.s
index e11cba62b40..cd75d75b01d 100644
--- a/llvm/test/MC/ELF/comdat-dup-group-name.s
+++ b/llvm/test/MC/ELF/comdat-dup-group-name.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t | FileCheck %s
// Test that we produce two foo sections, each in separate groups
diff --git a/llvm/test/MC/ELF/comdat-name-number.s b/llvm/test/MC/ELF/comdat-name-number.s
index 22e3adac2f8..48220d484c9 100644
--- a/llvm/test/MC/ELF/comdat-name-number.s
+++ b/llvm/test/MC/ELF/comdat-name-number.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o %t.o
-// RUN: llvm-readobj -elf-section-groups %t.o | FileCheck %s
+// RUN: llvm-readobj --elf-section-groups %t.o | FileCheck %s
// Test that we can handle numeric COMDAT names.
diff --git a/llvm/test/MC/ELF/comdat-reloc.s b/llvm/test/MC/ELF/comdat-reloc.s
index bc126f67fee..7eff043bede 100644
--- a/llvm/test/MC/ELF/comdat-reloc.s
+++ b/llvm/test/MC/ELF/comdat-reloc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
.text
.globl hello
diff --git a/llvm/test/MC/ELF/comdat.s b/llvm/test/MC/ELF/comdat.s
index 5e6fc64bac4..9e8de239e85 100644
--- a/llvm/test/MC/ELF/comdat.s
+++ b/llvm/test/MC/ELF/comdat.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t --sd | FileCheck %s
// Test that we produce the group sections and that they are before the members
diff --git a/llvm/test/MC/ELF/common2.s b/llvm/test/MC/ELF/common2.s
index bf9f22f90e9..54a27b05b23 100644
--- a/llvm/test/MC/ELF/common2.s
+++ b/llvm/test/MC/ELF/common2.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test local common construction.
// Unlike gas, common symbols are created when found, not at the end of .bss.
diff --git a/llvm/test/MC/ELF/compression.s b/llvm/test/MC/ELF/compression.s
index fddc4d28e57..93a77b3fcbd 100644
--- a/llvm/test/MC/ELF/compression.s
+++ b/llvm/test/MC/ELF/compression.s
@@ -4,16 +4,16 @@
// RUN: llvm-objdump -s %t | FileCheck --check-prefix=CHECK-GNU-STYLE %s
// RUN: llvm-dwarfdump -debug-str %t | FileCheck --check-prefix=STR %s
// RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib-gnu -triple i386-pc-linux-gnu < %s \
-// RUN: | llvm-readobj -symbols - | FileCheck --check-prefix=386-SYMBOLS-GNU %s
+// RUN: | llvm-readobj --symbols - | FileCheck --check-prefix=386-SYMBOLS-GNU %s
// Check zlib style
// RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib -triple x86_64-pc-linux-gnu < %s -o %t
// RUN: llvm-objdump -s %t | FileCheck --check-prefix=CHECK-ZLIB-STYLE %s
// RUN: llvm-dwarfdump -debug-str %t | FileCheck --check-prefix=STR %s
-// RUN: llvm-readobj -sections %t | FileCheck --check-prefixes=ZLIB-STYLE-FLAGS,ZLIB-STYLE-FLAGS64 %s
+// RUN: llvm-readobj --sections %t | FileCheck --check-prefixes=ZLIB-STYLE-FLAGS,ZLIB-STYLE-FLAGS64 %s
// RUN: llvm-mc -filetype=obj -compress-debug-sections=zlib -triple i386-pc-linux-gnu < %s -o %t
-// RUN: llvm-readobj -symbols -sections %t \
+// RUN: llvm-readobj --symbols -S %t \
// RUN: | FileCheck --check-prefixes=386-SYMBOLS-ZLIB,ZLIB-STYLE-FLAGS,ZLIB-STYLE-FLAGS32 %s
// Don't compress small sections, such as this simple debug_abbrev example
diff --git a/llvm/test/MC/ELF/debug-line.s b/llvm/test/MC/ELF/debug-line.s
index c831eb91571..89f07803f4b 100644
--- a/llvm/test/MC/ELF/debug-line.s
+++ b/llvm/test/MC/ELF/debug-line.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
// Test that .debug_line is populated. TODO: This test should really be using
// llvm-dwarfdump, but it cannot parse this particular object file. The content
diff --git a/llvm/test/MC/ELF/debug-line2.s b/llvm/test/MC/ELF/debug-line2.s
index 809b976824a..3c8b73092c5 100644
--- a/llvm/test/MC/ELF/debug-line2.s
+++ b/llvm/test/MC/ELF/debug-line2.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
// Test that two subsequent .loc directives generate two
// distinct line table entries.
diff --git a/llvm/test/MC/ELF/debug-loc.s b/llvm/test/MC/ELF/debug-loc.s
index 21eac60d896..841c05c2b71 100644
--- a/llvm/test/MC/ELF/debug-loc.s
+++ b/llvm/test/MC/ELF/debug-loc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test that we don't regress on the size of the line info section. We used
// to handle negative line diffs incorrectly which manifested as very
diff --git a/llvm/test/MC/ELF/dot-symbol-assignment.s b/llvm/test/MC/ELF/dot-symbol-assignment.s
index 284bef0f337..6f15100ff61 100644
--- a/llvm/test/MC/ELF/dot-symbol-assignment.s
+++ b/llvm/test/MC/ELF/dot-symbol-assignment.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -sections -section-data | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj --sections --section-data | FileCheck %s
one:
.quad 0xffffffffffffffff
diff --git a/llvm/test/MC/ELF/empty-dwarf-lines.s b/llvm/test/MC/ELF/empty-dwarf-lines.s
index 3b14fe0e6c5..e6ce76280aa 100644
--- a/llvm/test/MC/ELF/empty-dwarf-lines.s
+++ b/llvm/test/MC/ELF/empty-dwarf-lines.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test that the dwarf debug_line section contains no line directives.
diff --git a/llvm/test/MC/ELF/empty.s b/llvm/test/MC/ELF/empty.s
index ea88803a31d..e640715591a 100644
--- a/llvm/test/MC/ELF/empty.s
+++ b/llvm/test/MC/ELF/empty.s
@@ -1,6 +1,6 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin14.0.0-elf %s -o - | llvm-readobj -s | FileCheck %s -check-prefix=DARWIN
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32-elf %s -o - | llvm-readobj -s | FileCheck %s -check-prefix=WINDOWS
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin14.0.0-elf %s -o - | llvm-readobj -S | FileCheck %s -check-prefix=DARWIN
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32-elf %s -o - | llvm-readobj -S | FileCheck %s -check-prefix=WINDOWS
// Check that we can create ELF files for darwin/windows, even though
// it is not the default file format.
diff --git a/llvm/test/MC/ELF/entsize.ll b/llvm/test/MC/ELF/entsize.ll
index 941a300bdda..36f7ab7688d 100644
--- a/llvm/test/MC/ELF/entsize.ll
+++ b/llvm/test/MC/ELF/entsize.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj -mtriple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck -check-prefix=64 %s
+; RUN: llc -filetype=obj -mtriple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck -check-prefix=64 %s
; Test that constant mergeable strings have sh_entsize set.
diff --git a/llvm/test/MC/ELF/entsize.s b/llvm/test/MC/ELF/entsize.s
index 1dc6103189d..856fdcb3390 100644
--- a/llvm/test/MC/ELF/entsize.s
+++ b/llvm/test/MC/ELF/entsize.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// Test that mergeable constants have sh_entsize set.
diff --git a/llvm/test/MC/ELF/exclude-debug-dwo.s b/llvm/test/MC/ELF/exclude-debug-dwo.s
index c0f3b863e6e..02cdc0d3ff2 100644
--- a/llvm/test/MC/ELF/exclude-debug-dwo.s
+++ b/llvm/test/MC/ELF/exclude-debug-dwo.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o %t.o
-# RUN: llvm-readobj -s --elf-output-style=GNU %t.o | FileCheck %s
+# RUN: llvm-readobj -S --elf-output-style=GNU %t.o | FileCheck %s
## Check we add SHF_EXCLUDE flag for .dwo debug sections.
# CHECK: .debug_info.dwo {{.*}} E
diff --git a/llvm/test/MC/ELF/global-offset.s b/llvm/test/MC/ELF/global-offset.s
index c6886734ca4..3e5d8ac1431 100644
--- a/llvm/test/MC/ELF/global-offset.s
+++ b/llvm/test/MC/ELF/global-offset.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
// We test that _GLOBAL_OFFSET_TABLE_ will account for the two bytes at the
// start of the addl/leal.
diff --git a/llvm/test/MC/ELF/ident.s b/llvm/test/MC/ELF/ident.s
index 259220522e3..e7df90b9b37 100644
--- a/llvm/test/MC/ELF/ident.s
+++ b/llvm/test/MC/ELF/ident.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
// CHECK: Section {
// CHECK: Name: .comment
diff --git a/llvm/test/MC/ELF/leb128.s b/llvm/test/MC/ELF/leb128.s
index 84c5b54fa1a..87cdd33f414 100644
--- a/llvm/test/MC/ELF/leb128.s
+++ b/llvm/test/MC/ELF/leb128.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
.sleb128 .Lfoo - .Lbar
.Lfoo:
diff --git a/llvm/test/MC/ELF/local-reloc.s b/llvm/test/MC/ELF/local-reloc.s
index ce0b674364c..ef3713acdce 100644
--- a/llvm/test/MC/ELF/local-reloc.s
+++ b/llvm/test/MC/ELF/local-reloc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -r -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -r -t | FileCheck %s
// Test that relocations with local symbols are represented as relocations
// with the section. They should be equivalent, but gas behaves like this.
diff --git a/llvm/test/MC/ELF/many-sections-2.s b/llvm/test/MC/ELF/many-sections-2.s
index 71ac870c8bc..c068050cd42 100644
--- a/llvm/test/MC/ELF/many-sections-2.s
+++ b/llvm/test/MC/ELF/many-sections-2.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
-// RUN: llvm-readobj -s %t | FileCheck --check-prefix=SECTIONS %s
+// RUN: llvm-readobj -S %t | FileCheck --check-prefix=SECTIONS %s
// RUN: llvm-readobj -t %t | FileCheck --check-prefix=SYMBOLS %s
// Test that we create a .symtab_shndx if a symbol points to a section
diff --git a/llvm/test/MC/ELF/many-sections.s b/llvm/test/MC/ELF/many-sections.s
index b1348f3b7c3..ceae3d310b8 100644
--- a/llvm/test/MC/ELF/many-sections.s
+++ b/llvm/test/MC/ELF/many-sections.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
-// RUN: llvm-readobj -s %t | FileCheck --check-prefix=SECTIONS %s
+// RUN: llvm-readobj -S %t | FileCheck --check-prefix=SECTIONS %s
// RUN: llvm-readobj -t %t | FileCheck --check-prefix=SYMBOLS %s
// Test that we don't create a .symtab_shndx since we are one section short of
diff --git a/llvm/test/MC/ELF/n_bytes.s b/llvm/test/MC/ELF/n_bytes.s
index fcbd0e88c2c..7ad1b10bb37 100644
--- a/llvm/test/MC/ELF/n_bytes.s
+++ b/llvm/test/MC/ELF/n_bytes.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
.2byte 42, 1, 2, 3
.4byte 42, 1, 2, 3
diff --git a/llvm/test/MC/ELF/noexec.s b/llvm/test/MC/ELF/noexec.s
index e8f460e65fa..bfed7990b66 100644
--- a/llvm/test/MC/ELF/noexec.s
+++ b/llvm/test/MC/ELF/noexec.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -no-exec-stack -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -no-exec-stack -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// CHECK: Section {
// CHECK: Index:
diff --git a/llvm/test/MC/ELF/org.s b/llvm/test/MC/ELF/org.s
index d878fa1aab4..665bddcc482 100644
--- a/llvm/test/MC/ELF/org.s
+++ b/llvm/test/MC/ELF/org.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
.zero 4
foo:
diff --git a/llvm/test/MC/ELF/popsection.s b/llvm/test/MC/ELF/popsection.s
index ace6fac5e4c..69c2be5c22a 100644
--- a/llvm/test/MC/ELF/popsection.s
+++ b/llvm/test/MC/ELF/popsection.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -s - | FileCheck %s
+// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -S - | FileCheck %s
// This used to crash. Test that it create an empty section instead.
diff --git a/llvm/test/MC/ELF/relax.s b/llvm/test/MC/ELF/relax.s
index 93db0fe9b94..4a00b0f367e 100644
--- a/llvm/test/MC/ELF/relax.s
+++ b/llvm/test/MC/ELF/relax.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd -t | FileCheck %s
// Test that we do not relax these.
diff --git a/llvm/test/MC/ELF/relocation-pc.s b/llvm/test/MC/ELF/relocation-pc.s
index 85e97f05958..48bc55b2e0d 100644
--- a/llvm/test/MC/ELF/relocation-pc.s
+++ b/llvm/test/MC/ELF/relocation-pc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr | FileCheck %s
// Test that we produce the correct relocation.
diff --git a/llvm/test/MC/ELF/relocation-tls.s b/llvm/test/MC/ELF/relocation-tls.s
index d0c375551cc..00b4046ad34 100644
--- a/llvm/test/MC/ELF/relocation-tls.s
+++ b/llvm/test/MC/ELF/relocation-tls.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr | FileCheck %s
// Test that we produce the correct relocation.
diff --git a/llvm/test/MC/ELF/relocation.s b/llvm/test/MC/ELF/relocation.s
index c5bad60f077..d3a53567fe0 100644
--- a/llvm/test/MC/ELF/relocation.s
+++ b/llvm/test/MC/ELF/relocation.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr | FileCheck %s
// Test that we produce the correct relocation.
diff --git a/llvm/test/MC/ELF/rename.s b/llvm/test/MC/ELF/rename.s
index 8be06424cf2..1b97f770d9b 100644
--- a/llvm/test/MC/ELF/rename.s
+++ b/llvm/test/MC/ELF/rename.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sr -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sr -t | FileCheck %s
// When doing a rename, all the checks for where the relocation should go
// should be performed with the original symbol. Only if we decide to relocate
diff --git a/llvm/test/MC/ELF/section-numeric-flag.s b/llvm/test/MC/ELF/section-numeric-flag.s
index ee93826e415..b072930364a 100644
--- a/llvm/test/MC/ELF/section-numeric-flag.s
+++ b/llvm/test/MC/ELF/section-numeric-flag.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnu %s -o - \
-// RUN: | llvm-readobj -s -t | FileCheck %s
+// RUN: | llvm-readobj -S -t | FileCheck %s
.section .text, "0x806", %progbits, unique, 0
.section .comment, "0x21"
diff --git a/llvm/test/MC/ELF/section-numeric-invalid-type.s b/llvm/test/MC/ELF/section-numeric-invalid-type.s
index b8a39600eb1..902f5054693 100644
--- a/llvm/test/MC/ELF/section-numeric-invalid-type.s
+++ b/llvm/test/MC/ELF/section-numeric-invalid-type.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnu %s -o - \
-// RUN: | llvm-readobj -s -t | FileCheck --check-prefix=OBJ %s
+// RUN: | llvm-readobj -S -t | FileCheck --check-prefix=OBJ %s
// RUN: not llvm-mc -filetype=asm -triple=x86_64-pc-linux-gnu %s -o - 2>&1 \
// RUN: | FileCheck --check-prefix=ASM %s
diff --git a/llvm/test/MC/ELF/section-numeric-type.s b/llvm/test/MC/ELF/section-numeric-type.s
index 2e51bd4eb18..508026a8a46 100644
--- a/llvm/test/MC/ELF/section-numeric-type.s
+++ b/llvm/test/MC/ELF/section-numeric-type.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnu %s -o - \
-// RUN: | llvm-readobj -s -t | FileCheck --check-prefix=OBJ %s
+// RUN: | llvm-readobj -S -t | FileCheck --check-prefix=OBJ %s
// RUN: llvm-mc -filetype=asm -triple=x86_64-pc-linux-gnu %s -o - \
// RUN: | FileCheck --check-prefix=ASM %s
diff --git a/llvm/test/MC/ELF/section-sym.s b/llvm/test/MC/ELF/section-sym.s
index 5d5486f9f7a..ba49c326891 100644
--- a/llvm/test/MC/ELF/section-sym.s
+++ b/llvm/test/MC/ELF/section-sym.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t -r --expand-relocs | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S -t -r --expand-relocs | FileCheck %s
.section foo, "aG", @progbits, f1, comdat
.section foo, "G", @progbits, f2, comdat
diff --git a/llvm/test/MC/ELF/section.s b/llvm/test/MC/ELF/section.s
index 57755223db1..d31909f5f42 100644
--- a/llvm/test/MC/ELF/section.s
+++ b/llvm/test/MC/ELF/section.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S | FileCheck %s
// RUN: llvm-mc -filetype=asm -triple x86_64-pc-linux-gnu %s -o - | FileCheck %s --check-prefix=ASM
// Test that these names are accepted.
diff --git a/llvm/test/MC/ELF/sleb.s b/llvm/test/MC/ELF/sleb.s
index 280b42d8cac..600ce19754f 100644
--- a/llvm/test/MC/ELF/sleb.s
+++ b/llvm/test/MC/ELF/sleb.s
@@ -1,7 +1,7 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 %s
-// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_32 %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_64 %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 %s
+// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_32 %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_64 %s
.text
foo:
diff --git a/llvm/test/MC/ELF/strtab-suffix-opt.s b/llvm/test/MC/ELF/strtab-suffix-opt.s
index 69aa0933c99..fb9e895642d 100644
--- a/llvm/test/MC/ELF/strtab-suffix-opt.s
+++ b/llvm/test/MC/ELF/strtab-suffix-opt.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -symbols | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj --symbols | FileCheck %s
.text
.globl foobar
diff --git a/llvm/test/MC/ELF/uleb-ehtable.s b/llvm/test/MC/ELF/uleb-ehtable.s
index 55abefec64b..d54392a2578 100644
--- a/llvm/test/MC/ELF/uleb-ehtable.s
+++ b/llvm/test/MC/ELF/uleb-ehtable.s
@@ -1,7 +1,7 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF
-// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO
-// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=ELF
+// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO
+// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK -check-prefix=MACHO
// Test that we can assemble a GCC-like EH table that has 16381-16383 bytes of
// non-padding data between .ttbaseref and .ttbase. The assembler must insert
diff --git a/llvm/test/MC/ELF/uleb.s b/llvm/test/MC/ELF/uleb.s
index ffa84e9021d..e09ae6ca1cf 100644
--- a/llvm/test/MC/ELF/uleb.s
+++ b/llvm/test/MC/ELF/uleb.s
@@ -1,7 +1,7 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_32 %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=ELF_64 %s
-// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_32 %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -s -sd | FileCheck -check-prefix=MACHO_64 %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_32 %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=ELF_64 %s
+// RUN: llvm-mc -filetype=obj -triple i386-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_32 %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s -o - | llvm-readobj -S --sd | FileCheck -check-prefix=MACHO_64 %s
.text
foo:
diff --git a/llvm/test/MC/ELF/version.s b/llvm/test/MC/ELF/version.s
index 0bc9c8b7a78..f138e9ddca5 100644
--- a/llvm/test/MC/ELF/version.s
+++ b/llvm/test/MC/ELF/version.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
.version "1234"
.version "123"
diff --git a/llvm/test/MC/ELF/zero.s b/llvm/test/MC/ELF/zero.s
index be92eb839e1..bbd2b5604f0 100644
--- a/llvm/test/MC/ELF/zero.s
+++ b/llvm/test/MC/ELF/zero.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s
.zero 4
.zero 1,42
diff --git a/llvm/test/MC/Hexagon/elf-flags.s b/llvm/test/MC/Hexagon/elf-flags.s
index e5c4a8d93fe..5f67b37d4ca 100644
--- a/llvm/test/MC/Hexagon/elf-flags.s
+++ b/llvm/test/MC/Hexagon/elf-flags.s
@@ -1,7 +1,7 @@
-# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv5 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V5 %s
-# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv55 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V55 %s
-# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv60 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V60 %s
-# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv62 --filetype=obj %s -o - | llvm-readobj -file-headers -elf-output-style=GNU | FileCheck --check-prefix=CHECK-V62 %s
+# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv5 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V5 %s
+# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv55 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V55 %s
+# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv60 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V60 %s
+# RUN: llvm-mc -arch=hexagon -mcpu=hexagonv62 --filetype=obj %s -o - | llvm-readelf --file-headers | FileCheck --check-prefix=CHECK-V62 %s
# CHECK-V5: Flags: 0x4
# CHECK-V55: Flags: 0x5
diff --git a/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s b/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s
index a10aef3a5f8..547f5be43f9 100644
--- a/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s
+++ b/llvm/test/MC/MachO/AArch64/darwin-ARM64-local-label-diff.s
@@ -1,4 +1,4 @@
-; RUN: llvm-mc -triple arm64-apple-darwin -filetype=obj -o - < %s | llvm-readobj -s -sd | FileCheck %s
+; RUN: llvm-mc -triple arm64-apple-darwin -filetype=obj -o - < %s | llvm-readobj -S --sd | FileCheck %s
; rdar://13028719
.globl context_save0
diff --git a/llvm/test/MC/MachO/ARM/aliased-symbols.s b/llvm/test/MC/MachO/ARM/aliased-symbols.s
index cc2e200ce8a..dfe637c210e 100644
--- a/llvm/test/MC/MachO/ARM/aliased-symbols.s
+++ b/llvm/test/MC/MachO/ARM/aliased-symbols.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple thumbv7m-apple-darwin-eabi %s -filetype=obj -o %t
-// RUN: llvm-readobj -symbols %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
.data
var1 = var2
diff --git a/llvm/test/MC/MachO/ARM/build-version-encode.s b/llvm/test/MC/MachO/ARM/build-version-encode.s
index 19e75fafae9..d68f226cc9c 100644
--- a/llvm/test/MC/MachO/ARM/build-version-encode.s
+++ b/llvm/test/MC/MachO/ARM/build-version-encode.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc %s -triple x86_64-apple-tvos -filetype=obj | llvm-readobj -macho-version-min | FileCheck %s
+// RUN: llvm-mc %s -triple x86_64-apple-tvos -filetype=obj | llvm-readobj --macho-version-min | FileCheck %s
.build_version tvos,1,2,3
// CHECK: MinVersion {
diff --git a/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s b/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s
index a0bacec7aa5..ab0e3e92258 100644
--- a/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s
+++ b/llvm/test/MC/MachO/ARM/darwin-ARM-reloc.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -n -triple armv7-apple-darwin10 %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.obj > %t.dump
+@ RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.obj > %t.dump
@ RUN: FileCheck < %t.dump %s
.syntax unified
diff --git a/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s b/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s
index 7c85e0d3fe8..d2ad2c5e704 100644
--- a/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s
+++ b/llvm/test/MC/MachO/ARM/darwin-Thumb-reloc.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.obj > %t.dump
+@ RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.obj > %t.dump
@ RUN: FileCheck < %t.dump %s
.syntax unified
diff --git a/llvm/test/MC/MachO/ARM/empty-function-nop.ll b/llvm/test/MC/MachO/ARM/empty-function-nop.ll
index a2fc988c36e..dc09d165318 100644
--- a/llvm/test/MC/MachO/ARM/empty-function-nop.ll
+++ b/llvm/test/MC/MachO/ARM/empty-function-nop.ll
@@ -1,7 +1,7 @@
-; RUN: llc < %s -filetype=obj -mtriple=thumbv6-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-T1 %s
-; RUN: llc < %s -filetype=obj -mtriple=thumbv7-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-T2 %s
-; RUN: llc < %s -filetype=obj -mtriple=armv6-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-ARM %s
-; RUN: llc < %s -filetype=obj -mtriple=armv7-apple-darwin -o - | llvm-readobj -s -sd | FileCheck -check-prefix=CHECK-ARMV7 %s
+; RUN: llc < %s -filetype=obj -mtriple=thumbv6-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-T1 %s
+; RUN: llc < %s -filetype=obj -mtriple=thumbv7-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-T2 %s
+; RUN: llc < %s -filetype=obj -mtriple=armv6-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-ARM %s
+; RUN: llc < %s -filetype=obj -mtriple=armv7-apple-darwin -o - | llvm-readobj -S --sd | FileCheck -check-prefix=CHECK-ARMV7 %s
; Empty functions need a NOP in them for MachO to prevent DWARF FDEs from
; getting all mucked up. See lib/CodeGen/AsmPrinter/AsmPrinter.cpp for
diff --git a/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s b/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s
index c4d153fc2b6..e781c6d5618 100644
--- a/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s
+++ b/llvm/test/MC/MachO/ARM/long-call-branch-island-relocation.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -n -triple armv7-apple-darwin10 %s -filetype=obj -o %t.o
-@ RUN: llvm-readobj -relocations -expand-relocs < %t.o | FileCheck %s
+@ RUN: llvm-readobj -r --expand-relocs < %t.o | FileCheck %s
@ rdar://12359919
diff --git a/llvm/test/MC/MachO/ARM/no-subsections-reloc.s b/llvm/test/MC/MachO/ARM/no-subsections-reloc.s
index e367a3cfa73..68b9b3865a2 100644
--- a/llvm/test/MC/MachO/ARM/no-subsections-reloc.s
+++ b/llvm/test/MC/MachO/ARM/no-subsections-reloc.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump
+@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump
@ RUN: FileCheck < %t.dump %s
@ When not using subsections-via-symbols, references to non-local symbols
diff --git a/llvm/test/MC/MachO/ARM/nop-armv4-padding.s b/llvm/test/MC/MachO/ARM/nop-armv4-padding.s
index baab3d7491c..d63e506791e 100644
--- a/llvm/test/MC/MachO/ARM/nop-armv4-padding.s
+++ b/llvm/test/MC/MachO/ARM/nop-armv4-padding.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv4-apple-darwin %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump
+@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump
@ RUN: FileCheck %s < %t.dump
x:
diff --git a/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s b/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s
index a1a21f5f456..2b15ca0f54a 100644
--- a/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s
+++ b/llvm/test/MC/MachO/ARM/nop-armv6t2-padding.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv6t2-apple-darwin %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump
+@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump
@ RUN: FileCheck %s < %t.dump
x:
diff --git a/llvm/test/MC/MachO/ARM/nop-thumb-padding.s b/llvm/test/MC/MachO/ARM/nop-thumb-padding.s
index 26db12140de..ac041e110fa 100644
--- a/llvm/test/MC/MachO/ARM/nop-thumb-padding.s
+++ b/llvm/test/MC/MachO/ARM/nop-thumb-padding.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv6-apple-darwin %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump
+@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump
@ RUN: FileCheck %s < %t.dump
.thumb_func x
diff --git a/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s b/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s
index a986ff17f2a..e032c8a7de0 100644
--- a/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s
+++ b/llvm/test/MC/MachO/ARM/nop-thumb2-padding.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-apple-darwin %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump
+@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump
@ RUN: FileCheck %s < %t.dump
.thumb_func x
diff --git a/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s b/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s
index f6f2233e6f9..d2d85194d87 100644
--- a/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s
+++ b/llvm/test/MC/MachO/ARM/relax-thumb-ldr-literal.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump
+@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump
@ RUN: FileCheck < %t.dump %s
.syntax unified
diff --git a/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s b/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s
index fbac5fd4260..7563f4f62ff 100644
--- a/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s
+++ b/llvm/test/MC/MachO/ARM/relax-thumb2-branches.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple=thumbv7-apple-darwin -show-encoding %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s
+@ RUN: llvm-mc -triple=thumbv7-apple-darwin -show-encoding %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s
ble Lfoo @ wide encoding
diff --git a/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s b/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s
index 2657fd9d99d..b5296b70c82 100644
--- a/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s
+++ b/llvm/test/MC/MachO/ARM/thumb-bl-jbits.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple=thumbv7-apple-darwin -filetype=obj -o - < %s | llvm-readobj -s -sd | FileCheck %s
+@ RUN: llvm-mc -triple=thumbv7-apple-darwin -filetype=obj -o - < %s | llvm-readobj -S --sd | FileCheck %s
.thumb
.thumb_func t
t: nop
diff --git a/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s b/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s
index 1a91675fae5..bdc4aa9c47d 100644
--- a/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s
+++ b/llvm/test/MC/MachO/ARM/thumb2-function-relative-load.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -n -triple thumbv7-apple-darwin10 %s -filetype=obj -o %t.obj
-@ RUN: llvm-readobj -s -sd < %t.obj > %t.dump
+@ RUN: llvm-readobj -S --sd < %t.obj > %t.dump
@ RUN: FileCheck < %t.dump %s
.syntax unified
.text
diff --git a/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s b/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s
index 5cfb3f4c918..c946e5c6ea7 100644
--- a/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s
+++ b/llvm/test/MC/MachO/ARM/thumb2-movt-fixup.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -relocations -expand-relocs | FileCheck %s
+@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -r --expand-relocs | FileCheck %s
_fred:
movt r3, :upper16:(_wilma-(LPC0_0+4))
diff --git a/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s b/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s
index 9c21d9b5b50..3191a90852b 100644
--- a/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s
+++ b/llvm/test/MC/MachO/ARM/thumb2-movw-fixup.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -relocations -expand-relocs | FileCheck %s
+@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | llvm-readobj -r --expand-relocs | FileCheck %s
@ rdar://10038370
diff --git a/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s b/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s
index 1c3dc37d5bd..31ea99ba71e 100644
--- a/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s
+++ b/llvm/test/MC/MachO/PowerPC/coal-sections-powerpc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple powerpc-apple-darwin8 -arch=ppc32 -filetype=obj %s -o - | llvm-readobj -sections | FileCheck %s
+// RUN: llvm-mc -triple powerpc-apple-darwin8 -arch=ppc32 -filetype=obj %s -o - | llvm-readobj --sections | FileCheck %s
// CHECK: Section {
// CHECK-NEXT: Index: 0
diff --git a/llvm/test/MC/MachO/absolute.s b/llvm/test/MC/MachO/absolute.s
index 26850a2d09a..079a16398e4 100644
--- a/llvm/test/MC/MachO/absolute.s
+++ b/llvm/test/MC/MachO/absolute.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
_bar:
nop
diff --git a/llvm/test/MC/MachO/absolutize.s b/llvm/test/MC/MachO/absolutize.s
index 1f5ed32ff72..7e2a0452d44 100644
--- a/llvm/test/MC/MachO/absolutize.s
+++ b/llvm/test/MC/MachO/absolutize.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
_text_a:
xorl %eax,%eax
diff --git a/llvm/test/MC/MachO/bss.s b/llvm/test/MC/MachO/bss.s
index c5afe107782..426ae163165 100644
--- a/llvm/test/MC/MachO/bss.s
+++ b/llvm/test/MC/MachO/bss.s
@@ -1,7 +1,7 @@
// The purpose of this test is to verify that bss sections are emitted correctly.
-// RUN: llvm-mc -filetype=obj -triple i686-apple-darwin9 %s | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-apple-darwin9 %s | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-apple-darwin9 %s | llvm-readobj -S | FileCheck %s
.bss
.globl _g0
diff --git a/llvm/test/MC/MachO/coal-sections-x86_64.s b/llvm/test/MC/MachO/coal-sections-x86_64.s
index 5ecdc578dbb..f91373e0793 100644
--- a/llvm/test/MC/MachO/coal-sections-x86_64.s
+++ b/llvm/test/MC/MachO/coal-sections-x86_64.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - 2>%t.err | llvm-readobj -sections | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - 2>%t.err | llvm-readobj --sections | FileCheck %s
// RUN: FileCheck --check-prefix=WARNING < %t.err %s
// CHECK: Section {
diff --git a/llvm/test/MC/MachO/comm-1.s b/llvm/test/MC/MachO/comm-1.s
index 1b64e94c2c3..18eeb7475cc 100644
--- a/llvm/test/MC/MachO/comm-1.s
+++ b/llvm/test/MC/MachO/comm-1.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.comm sym_comm_B, 2
.comm sym_comm_A, 4
diff --git a/llvm/test/MC/MachO/darwin-complex-difference.s b/llvm/test/MC/MachO/darwin-complex-difference.s
index 84940ba68f8..1f2f6e71268 100644
--- a/llvm/test/MC/MachO/darwin-complex-difference.s
+++ b/llvm/test/MC/MachO/darwin-complex-difference.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o %t.o
-// RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.o > %t.dump
+// RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.o > %t.dump
// RUN: FileCheck < %t.dump %s
_a:
diff --git a/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s b/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s
index 9d69a493dd8..f819f786ffb 100644
--- a/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s
+++ b/llvm/test/MC/MachO/darwin-x86_64-diff-relocs.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.text
diff --git a/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s b/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s
index 857c3541d65..1559998501f 100644
--- a/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s
+++ b/llvm/test/MC/MachO/darwin-x86_64-nobase-relocs.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -n -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment | FileCheck %s
+// RUN: llvm-mc -n -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s
// Test case for rdar://10062261
diff --git a/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s b/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s
index e7f0c5baf8d..177fee634e8 100644
--- a/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s
+++ b/llvm/test/MC/MachO/darwin-x86_64-reloc-offsets.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.data
diff --git a/llvm/test/MC/MachO/data.s b/llvm/test/MC/MachO/data.s
index 90679a989f7..64ca12133dd 100644
--- a/llvm/test/MC/MachO/data.s
+++ b/llvm/test/MC/MachO/data.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -macho-segment | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --macho-segment | FileCheck %s
.data
.ascii "hello"
diff --git a/llvm/test/MC/MachO/debug_frame.s b/llvm/test/MC/MachO/debug_frame.s
index 509c57ac2c2..7ecc7463bec 100644
--- a/llvm/test/MC/MachO/debug_frame.s
+++ b/llvm/test/MC/MachO/debug_frame.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin %s -filetype=obj -o - | llvm-readobj -s -sd -r | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin %s -filetype=obj -o - | llvm-readobj -S --sd -r | FileCheck %s
// Make sure MC can handle file level .cfi_startproc and .cfi_endproc that creates
// an empty frame.
diff --git a/llvm/test/MC/MachO/diff-with-two-sections.s b/llvm/test/MC/MachO/diff-with-two-sections.s
index d63f4a05725..0637f267791 100644
--- a/llvm/test/MC/MachO/diff-with-two-sections.s
+++ b/llvm/test/MC/MachO/diff-with-two-sections.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment -macho-version-min | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment --macho-version-min | FileCheck %s
.section __TEXT,__text,regular,pure_instructions
Leh_func_begin0:
diff --git a/llvm/test/MC/MachO/direction_labels.s b/llvm/test/MC/MachO/direction_labels.s
index 345a7521d7a..91075a7e152 100644
--- a/llvm/test/MC/MachO/direction_labels.s
+++ b/llvm/test/MC/MachO/direction_labels.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
direction_labels:
10: nop
diff --git a/llvm/test/MC/MachO/file.s b/llvm/test/MC/MachO/file.s
index eddbb599d97..487d8e3c3d9 100644
--- a/llvm/test/MC/MachO/file.s
+++ b/llvm/test/MC/MachO/file.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -section-data | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --section-data | FileCheck %s
// This number-less file directive is ignored on MachO.
.file "bar/baz.s"
diff --git a/llvm/test/MC/MachO/indirect-symbols.s b/llvm/test/MC/MachO/indirect-symbols.s
index 4ab384821d9..4120f8eb8d8 100644
--- a/llvm/test/MC/MachO/indirect-symbols.s
+++ b/llvm/test/MC/MachO/indirect-symbols.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
_b:
_c = 0
diff --git a/llvm/test/MC/MachO/jcc.s b/llvm/test/MC/MachO/jcc.s
index caff25714a0..d9941b9c674 100644
--- a/llvm/test/MC/MachO/jcc.s
+++ b/llvm/test/MC/MachO/jcc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s
ja 1f
1: nop
diff --git a/llvm/test/MC/MachO/lcomm-attributes.s b/llvm/test/MC/MachO/lcomm-attributes.s
index 5f902ebac4f..918bb729fd6 100644
--- a/llvm/test/MC/MachO/lcomm-attributes.s
+++ b/llvm/test/MC/MachO/lcomm-attributes.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
// Note, this test intentionally mismatches Darwin 'as', which loses the
// following global marker.
diff --git a/llvm/test/MC/MachO/linker-option-2.s b/llvm/test/MC/MachO/linker-option-2.s
index 415d02e536b..8f9a8ffbb09 100644
--- a/llvm/test/MC/MachO/linker-option-2.s
+++ b/llvm/test/MC/MachO/linker-option-2.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -n -triple x86_64-apple-darwin10 %s -filetype=obj | llvm-readobj -macho-linker-options | FileCheck %s
+// RUN: llvm-mc -n -triple x86_64-apple-darwin10 %s -filetype=obj | llvm-readobj --macho-linker-options | FileCheck %s
.linker_option "a"
.linker_option "a", "b"
diff --git a/llvm/test/MC/MachO/linker-options.ll b/llvm/test/MC/MachO/linker-options.ll
index d9d7a4a46d8..86c1d8e90b5 100644
--- a/llvm/test/MC/MachO/linker-options.ll
+++ b/llvm/test/MC/MachO/linker-options.ll
@@ -4,7 +4,7 @@
; CHECK-ASM: .linker_option "-lz"
; CHECK-ASM-NEXT: .linker_option "-framework", "Cocoa"
-; RUN: llc -O0 -mtriple=x86_64-apple-darwin -filetype=obj -o - %s | llvm-readobj -macho-linker-options > %t
+; RUN: llc -O0 -mtriple=x86_64-apple-darwin -filetype=obj -o - %s | llvm-readobj --macho-linker-options > %t
; RUN: FileCheck --check-prefix=CHECK-OBJ < %t %s
; CHECK-OBJ: Linker Options {
diff --git a/llvm/test/MC/MachO/loc.s b/llvm/test/MC/MachO/loc.s
index ef4c815360c..c8f61feb11f 100644
--- a/llvm/test/MC/MachO/loc.s
+++ b/llvm/test/MC/MachO/loc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -s -sd | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -S --sd | FileCheck %s
.file 2 "foo"
.file 1 "bar"
.loc 2 64 0
diff --git a/llvm/test/MC/MachO/pcrel-to-other-section.s b/llvm/test/MC/MachO/pcrel-to-other-section.s
index cf46b0dcb0f..2277f5a3fa8 100644
--- a/llvm/test/MC/MachO/pcrel-to-other-section.s
+++ b/llvm/test/MC/MachO/pcrel-to-other-section.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
nop
.section __TEXT,__StaticInit,regular,pure_instructions
diff --git a/llvm/test/MC/MachO/relax-jumps.s b/llvm/test/MC/MachO/relax-jumps.s
index ab68eb1d6c2..104fd8c8498 100644
--- a/llvm/test/MC/MachO/relax-jumps.s
+++ b/llvm/test/MC/MachO/relax-jumps.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s
// FIXME: This is a horrible way of checking the output, we need an llvm-mc
// based 'otool'. Use:
diff --git a/llvm/test/MC/MachO/relax-recompute-align.s b/llvm/test/MC/MachO/relax-recompute-align.s
index 1369bcdf5ae..99f8fb95145 100644
--- a/llvm/test/MC/MachO/relax-recompute-align.s
+++ b/llvm/test/MC/MachO/relax-recompute-align.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S | FileCheck %s
// FIXME: This is a horrible way of checking the output, we need an llvm-mc
// based 'otool'.
diff --git a/llvm/test/MC/MachO/reloc-pcrel-offset.s b/llvm/test/MC/MachO/reloc-pcrel-offset.s
index d4d6ddf48dd..63887bfc9dc 100644
--- a/llvm/test/MC/MachO/reloc-pcrel-offset.s
+++ b/llvm/test/MC/MachO/reloc-pcrel-offset.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -n -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -s -sd | FileCheck %s
+// RUN: llvm-mc -n -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -S --sd | FileCheck %s
.data
.long 0
diff --git a/llvm/test/MC/MachO/reloc.s b/llvm/test/MC/MachO/reloc.s
index 6a78d0452ed..1379d80eb31 100644
--- a/llvm/test/MC/MachO/reloc.s
+++ b/llvm/test/MC/MachO/reloc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r -expand-relocs | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -r --expand-relocs | FileCheck %s
.data
.long undef
diff --git a/llvm/test/MC/MachO/section-align-1.s b/llvm/test/MC/MachO/section-align-1.s
index db071658550..161b52dc702 100644
--- a/llvm/test/MC/MachO/section-align-1.s
+++ b/llvm/test/MC/MachO/section-align-1.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -t -file-headers -s -macho-indirect-symbols -macho-dysymtab -macho-segment | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -t --file-headers -S --macho-indirect-symbols --macho-dysymtab --macho-segment | FileCheck %s
name:
.byte 0
diff --git a/llvm/test/MC/MachO/section-align-2.s b/llvm/test/MC/MachO/section-align-2.s
index 4a2099a4b0c..847db230533 100644
--- a/llvm/test/MC/MachO/section-align-2.s
+++ b/llvm/test/MC/MachO/section-align-2.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.byte 0
diff --git a/llvm/test/MC/MachO/section-attributes.s b/llvm/test/MC/MachO/section-attributes.s
index 0c2913e4aca..243d823d68b 100644
--- a/llvm/test/MC/MachO/section-attributes.s
+++ b/llvm/test/MC/MachO/section-attributes.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o %t
-// RUN: llvm-readobj -s -sd %t | FileCheck %s
+// RUN: llvm-readobj -S --sd %t | FileCheck %s
.section __TEXT,__objc_opt_ro
.long 0
diff --git a/llvm/test/MC/MachO/section-flags.s b/llvm/test/MC/MachO/section-flags.s
index da5c4c13317..ca12c50820f 100644
--- a/llvm/test/MC/MachO/section-flags.s
+++ b/llvm/test/MC/MachO/section-flags.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s
.text
diff --git a/llvm/test/MC/MachO/string-table.s b/llvm/test/MC/MachO/string-table.s
index 0902a3477b5..bbbef7a4433 100644
--- a/llvm/test/MC/MachO/string-table.s
+++ b/llvm/test/MC/MachO/string-table.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
movl $a, b
diff --git a/llvm/test/MC/MachO/symbol-diff.s b/llvm/test/MC/MachO/symbol-diff.s
index 2c3b52f85a8..b035ab1edb0 100644
--- a/llvm/test/MC/MachO/symbol-diff.s
+++ b/llvm/test/MC/MachO/symbol-diff.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
_g:
LFB2:
.section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
diff --git a/llvm/test/MC/MachO/symbol-flags.s b/llvm/test/MC/MachO/symbol-flags.s
index 8f001e5c612..bc66be758ec 100644
--- a/llvm/test/MC/MachO/symbol-flags.s
+++ b/llvm/test/MC/MachO/symbol-flags.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.reference sym_ref_A
.reference sym_ref_def_A
diff --git a/llvm/test/MC/MachO/symbol-indirect.s b/llvm/test/MC/MachO/symbol-indirect.s
index c0012b70355..5dbe5d07c55 100644
--- a/llvm/test/MC/MachO/symbol-indirect.s
+++ b/llvm/test/MC/MachO/symbol-indirect.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
// FIXME: We are missing a lot of diagnostics on this kind of stuff which the
// assembler has.
diff --git a/llvm/test/MC/MachO/symbols-1.s b/llvm/test/MC/MachO/symbols-1.s
index bec31bb7345..a8f83d03883 100644
--- a/llvm/test/MC/MachO/symbols-1.s
+++ b/llvm/test/MC/MachO/symbols-1.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_32 %s
-// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_64 %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_32 %s
+// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck -check-prefix CHECK-X86_64 %s
sym_local_B:
.globl sym_globl_def_B
diff --git a/llvm/test/MC/MachO/tbss.s b/llvm/test/MC/MachO/tbss.s
index a2577290926..465b52aad76 100644
--- a/llvm/test/MC/MachO/tbss.s
+++ b/llvm/test/MC/MachO/tbss.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.tbss _a$tlv$init, 4
.tbss _b$tlv$init, 4, 3
diff --git a/llvm/test/MC/MachO/tdata.s b/llvm/test/MC/MachO/tdata.s
index 855ce54c0ab..90303fad3ca 100644
--- a/llvm/test/MC/MachO/tdata.s
+++ b/llvm/test/MC/MachO/tdata.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.tdata
_a$tlv$init:
.long 4
diff --git a/llvm/test/MC/MachO/thread_init_func.s b/llvm/test/MC/MachO/thread_init_func.s
index 912d7824140..c9a5edf6dd4 100644
--- a/llvm/test/MC/MachO/thread_init_func.s
+++ b/llvm/test/MC/MachO/thread_init_func.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -macho-segment | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s
.thread_init_func
.quad 0
diff --git a/llvm/test/MC/MachO/tls.s b/llvm/test/MC/MachO/tls.s
index 438c7f04c8e..3d451a52254 100644
--- a/llvm/test/MC/MachO/tls.s
+++ b/llvm/test/MC/MachO/tls.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.section __TEXT,__text,regular,pure_instructions
.section __DATA,__thread_data,thread_local_regular
diff --git a/llvm/test/MC/MachO/tlv-bss.ll b/llvm/test/MC/MachO/tlv-bss.ll
index 9a6ea20266f..1ffddd2e1a0 100644
--- a/llvm/test/MC/MachO/tlv-bss.ll
+++ b/llvm/test/MC/MachO/tlv-bss.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O0 -mtriple=x86_64-apple-darwin12 -filetype=obj -o - %s | llvm-readobj -s | FileCheck %s
+; RUN: llc -O0 -mtriple=x86_64-apple-darwin12 -filetype=obj -o - %s | llvm-readobj -S | FileCheck %s
; Test that we emit weak_odr thread_locals correctly into the thread_bss section
; PR15972
diff --git a/llvm/test/MC/MachO/tlv-reloc.s b/llvm/test/MC/MachO/tlv-reloc.s
index ca6873478dc..b8b14705401 100644
--- a/llvm/test/MC/MachO/tlv-reloc.s
+++ b/llvm/test/MC/MachO/tlv-reloc.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.tdata
_a$tlv$init:
diff --git a/llvm/test/MC/MachO/tlv.s b/llvm/test/MC/MachO/tlv.s
index 57d74448aea..cd8128490ae 100644
--- a/llvm/test/MC/MachO/tlv.s
+++ b/llvm/test/MC/MachO/tlv.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.tlv
.globl _a
diff --git a/llvm/test/MC/MachO/values.s b/llvm/test/MC/MachO/values.s
index 0bdd0946770..d3a85fc887d 100644
--- a/llvm/test/MC/MachO/values.s
+++ b/llvm/test/MC/MachO/values.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.long 0
text_def_int:
diff --git a/llvm/test/MC/MachO/variable-exprs.s b/llvm/test/MC/MachO/variable-exprs.s
index 380e7e75cc7..18b965faa5c 100644
--- a/llvm/test/MC/MachO/variable-exprs.s
+++ b/llvm/test/MC/MachO/variable-exprs.s
@@ -1,9 +1,9 @@
// RUN: llvm-mc -triple i386-apple-darwin10 %s -filetype=obj -o %t.o
-// RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.o > %t.dump
+// RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.o > %t.dump
// RUN: FileCheck --check-prefix=CHECK-I386 < %t.dump %s
// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o %t.o
-// RUN: llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols < %t.o > %t.dump
+// RUN: llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols < %t.o > %t.dump
// RUN: FileCheck --check-prefix=CHECK-X86_64 < %t.dump %s
.data
diff --git a/llvm/test/MC/MachO/weakdef.s b/llvm/test/MC/MachO/weakdef.s
index 2043dc86f74..cc294c3ff8d 100644
--- a/llvm/test/MC/MachO/weakdef.s
+++ b/llvm/test/MC/MachO/weakdef.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.section __DATA,__datacoal_nt,coalesced
.section __TEXT,__const_coal,coalesced
diff --git a/llvm/test/MC/MachO/x86_32-optimal_nop.s b/llvm/test/MC/MachO/x86_32-optimal_nop.s
index b9b6fd12d4a..925b747dd1a 100644
--- a/llvm/test/MC/MachO/x86_32-optimal_nop.s
+++ b/llvm/test/MC/MachO/x86_32-optimal_nop.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 -mcpu=pentiumpro %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t -macho-segment -macho-dysymtab -macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 -mcpu=pentiumpro %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
# 1 byte nop test
.align 4, 0 # start with 16 byte alignment filled with zeros
diff --git a/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s b/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s
index b2dc27b3e1c..909daa2bd27 100644
--- a/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s
+++ b/llvm/test/MC/MachO/x86_32-scattered-reloc-fallback.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -S --sd | FileCheck %s
// rdar://15526046
diff --git a/llvm/test/MC/MachO/x86_32-sections.s b/llvm/test/MC/MachO/x86_32-sections.s
index a78ac17db1d..24c45d0b153 100644
--- a/llvm/test/MC/MachO/x86_32-sections.s
+++ b/llvm/test/MC/MachO/x86_32-sections.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd --macho-segment | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd --macho-segment | FileCheck %s
.text
.section __TEXT,__text,regular,pure_instructions
diff --git a/llvm/test/MC/MachO/x86_32-symbols.s b/llvm/test/MC/MachO/x86_32-symbols.s
index 1a4ffafb745..abce76f2c85 100644
--- a/llvm/test/MC/MachO/x86_32-symbols.s
+++ b/llvm/test/MC/MachO/x86_32-symbols.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.text
L0:
diff --git a/llvm/test/MC/MachO/x86_64-sections.s b/llvm/test/MC/MachO/x86_64-sections.s
index 5ca83257f30..262b5c40b5e 100644
--- a/llvm/test/MC/MachO/x86_64-sections.s
+++ b/llvm/test/MC/MachO/x86_64-sections.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r --macho-segment | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r --macho-segment | FileCheck %s
.text
.section __TEXT,__text,regular,pure_instructions
diff --git a/llvm/test/MC/MachO/zero-space.s b/llvm/test/MC/MachO/zero-space.s
index b823c429905..ab1970d5e81 100644
--- a/llvm/test/MC/MachO/zero-space.s
+++ b/llvm/test/MC/MachO/zero-space.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.const
.p2align 6
diff --git a/llvm/test/MC/MachO/zerofill-1.s b/llvm/test/MC/MachO/zerofill-1.s
index c3de2ebbf79..a2fd4fe122d 100644
--- a/llvm/test/MC/MachO/zerofill-1.s
+++ b/llvm/test/MC/MachO/zerofill-1.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.text
.byte 0 // Align to 2**3 bytes, not 2**1
diff --git a/llvm/test/MC/MachO/zerofill-2.s b/llvm/test/MC/MachO/zerofill-2.s
index e2e2dfac6fe..8879c7bfe61 100644
--- a/llvm/test/MC/MachO/zerofill-2.s
+++ b/llvm/test/MC/MachO/zerofill-2.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.byte 0
diff --git a/llvm/test/MC/MachO/zerofill-3.s b/llvm/test/MC/MachO/zerofill-3.s
index 2e4ff278132..4beb93c99d0 100644
--- a/llvm/test/MC/MachO/zerofill-3.s
+++ b/llvm/test/MC/MachO/zerofill-3.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
// FIXME: We don't get the order right currently, the assembler first
// orders the symbols, then assigns addresses. :(
diff --git a/llvm/test/MC/MachO/zerofill-5.s b/llvm/test/MC/MachO/zerofill-5.s
index b688e6b0692..fa8e7cdb9c6 100644
--- a/llvm/test/MC/MachO/zerofill-5.s
+++ b/llvm/test/MC/MachO/zerofill-5.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj -file-headers -s -sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin9 %s -filetype=obj -o - | llvm-readobj --file-headers -S --sd -r -t --macho-segment --macho-dysymtab --macho-indirect-symbols | FileCheck %s
.text
.align 3
diff --git a/llvm/test/MC/Mips/addend.s b/llvm/test/MC/Mips/addend.s
index 93ce4f413ae..984f69cb796 100644
--- a/llvm/test/MC/Mips/addend.s
+++ b/llvm/test/MC/Mips/addend.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 %s -o %t.o
-# RUN: llvm-readobj -s -section-data %t.o | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t.o | FileCheck %s
# CHECK: Name: .text
# CHECK-NEXT: Type:
diff --git a/llvm/test/MC/Mips/cfi-advance-loc.s b/llvm/test/MC/Mips/cfi-advance-loc.s
index c84e7e16237..4f5666ab33c 100644
--- a/llvm/test/MC/Mips/cfi-advance-loc.s
+++ b/llvm/test/MC/Mips/cfi-advance-loc.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -filetype=obj -triple mipsel-pc-Linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK-LE
-// RUN: llvm-mc -filetype=obj -triple mips-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s -check-prefix=CHECK-BE
+// RUN: llvm-mc -filetype=obj -triple mipsel-pc-Linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK-LE
+// RUN: llvm-mc -filetype=obj -triple mips-pc-linux-gnu %s -o - | llvm-readobj -S --sd | FileCheck %s -check-prefix=CHECK-BE
// test that this produces a correctly encoded cfi_advance_loc for both endians.
diff --git a/llvm/test/MC/Mips/crc/module-crc.s b/llvm/test/MC/Mips/crc/module-crc.s
index 6d00c52e902..92c428e67ff 100644
--- a/llvm/test/MC/Mips/crc/module-crc.s
+++ b/llvm/test/MC/Mips/crc/module-crc.s
@@ -3,7 +3,7 @@
#
# RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r6 \
# RUN: -filetype=obj -o - | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module crc
diff --git a/llvm/test/MC/Mips/crc/module-nocrc.s b/llvm/test/MC/Mips/crc/module-nocrc.s
index 19020570ac9..c67279194c8 100644
--- a/llvm/test/MC/Mips/crc/module-nocrc.s
+++ b/llvm/test/MC/Mips/crc/module-nocrc.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r6 -filetype=obj -o - -mattr=+crc | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module nocrc
diff --git a/llvm/test/MC/Mips/directive-ent.s b/llvm/test/MC/Mips/directive-ent.s
index fa15b4eb9c8..4271c046c0e 100644
--- a/llvm/test/MC/Mips/directive-ent.s
+++ b/llvm/test/MC/Mips/directive-ent.s
@@ -4,14 +4,14 @@
# RUN: llvm-mc -mcpu=mips32 -triple mips-unknown-unknown %s | \
# RUN: FileCheck -check-prefix=ASM %s
# RUN: llvm-mc -filetype=obj -mcpu=mips32 -triple mips-unknown-unknown %s | \
-# RUN: llvm-readobj -symbols | \
+# RUN: llvm-readobj --symbols | \
# RUN: FileCheck -check-prefixes=OBJ,OBJ-32 %s
#
# RUN: llvm-mc -mcpu=mips32 -mattr=micromips -triple mips-unknown-unknown %s | \
# RUN: FileCheck -check-prefix=ASM %s
# RUN: llvm-mc -filetype=obj -mcpu=mips32 -mattr=micromips \
# RUN: -triple mips-unknown-unknown %s | \
-# RUN: llvm-readobj -symbols | \
+# RUN: llvm-readobj --symbols | \
# RUN: FileCheck -check-prefixes=OBJ,OBJ-MM %s
#
.ent a
diff --git a/llvm/test/MC/Mips/elf-bigendian.ll b/llvm/test/MC/Mips/elf-bigendian.ll
index 4990f4e5b75..cbabd537bd6 100644
--- a/llvm/test/MC/Mips/elf-bigendian.ll
+++ b/llvm/test/MC/Mips/elf-bigendian.ll
@@ -1,4 +1,4 @@
-; DISABLE: llc -filetype=obj -mtriple mips-unknown-linux %s -o - | llvm-readobj -h -s -sd | FileCheck %s
+; DISABLE: llc -filetype=obj -mtriple mips-unknown-linux %s -o - | llvm-readobj -h -S --sd | FileCheck %s
; RUN: false
; XFAIL: *
diff --git a/llvm/test/MC/Mips/elf-debug-section.s b/llvm/test/MC/Mips/elf-debug-section.s
index 6cc901bcb59..8e936f7bac5 100644
--- a/llvm/test/MC/Mips/elf-debug-section.s
+++ b/llvm/test/MC/Mips/elf-debug-section.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple=mips-linux-gnu -g %s -o - \
-# RUN: | llvm-readobj -s | FileCheck %s
+# RUN: | llvm-readobj -S | FileCheck %s
# CHECK: Section {
# CHECK: Name: .debug_line
diff --git a/llvm/test/MC/Mips/elf_reginfo.s b/llvm/test/MC/Mips/elf_reginfo.s
index 8a4ed3b9694..ea6e39601ef 100644
--- a/llvm/test/MC/Mips/elf_reginfo.s
+++ b/llvm/test/MC/Mips/elf_reginfo.s
@@ -2,9 +2,9 @@
# corresponding options (-mabi=64 -> -mattr=+n64 for example).
# RUN: llvm-mc -filetype=obj -triple=mips64el-linux -target-abi n64 %s -o - \
-# RUN: | llvm-readobj -s | FileCheck --check-prefix=CHECK_64 %s
+# RUN: | llvm-readobj -S | FileCheck --check-prefix=CHECK_64 %s
# RUN: llvm-mc -filetype=obj -triple=mipsel %s -target-abi n32 -o - \
-# RUN: | llvm-readobj -s | FileCheck --check-prefix=CHECK_32 %s
+# RUN: | llvm-readobj -S | FileCheck --check-prefix=CHECK_32 %s
# Check for register information sections.
#
diff --git a/llvm/test/MC/Mips/end-directive.s b/llvm/test/MC/Mips/end-directive.s
index b2959409e66..a357b35b7be 100644
--- a/llvm/test/MC/Mips/end-directive.s
+++ b/llvm/test/MC/Mips/end-directive.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -arch=mips -mcpu=mips32 -filetype=obj %s -o - | \
-# RUN: llvm-readobj -symbols | FileCheck %s
+# RUN: llvm-readobj --symbols | FileCheck %s
# Check that the assembler doesn't choke on .align between a symbol and the
# .end directive.
diff --git a/llvm/test/MC/Mips/ginv/module-ginv.s b/llvm/test/MC/Mips/ginv/module-ginv.s
index 49f3aa5628e..07f1bc4d40e 100644
--- a/llvm/test/MC/Mips/ginv/module-ginv.s
+++ b/llvm/test/MC/Mips/ginv/module-ginv.s
@@ -3,7 +3,7 @@
#
# RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r6 \
# RUN: -filetype=obj -o - | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module ginv
diff --git a/llvm/test/MC/Mips/ginv/module-noginv.s b/llvm/test/MC/Mips/ginv/module-noginv.s
index 86edb03c80a..2ed4fd9c314 100644
--- a/llvm/test/MC/Mips/ginv/module-noginv.s
+++ b/llvm/test/MC/Mips/ginv/module-noginv.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r6 -filetype=obj -o - -mattr=+ginv | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module noginv
diff --git a/llvm/test/MC/Mips/insn-directive.s b/llvm/test/MC/Mips/insn-directive.s
index f8cc1d6812d..b08fb02d52e 100644
--- a/llvm/test/MC/Mips/insn-directive.s
+++ b/llvm/test/MC/Mips/insn-directive.s
@@ -1,7 +1,7 @@
# RUN: llvm-mc %s -arch=mips -mcpu=mips32 | FileCheck %s --check-prefix=ASM
# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \
-# RUN: llvm-readobj -symbols - | FileCheck %s --check-prefix=OBJ
+# RUN: llvm-readobj --symbols - | FileCheck %s --check-prefix=OBJ
.set micromips
diff --git a/llvm/test/MC/Mips/micromips-ase-directive.s b/llvm/test/MC/Mips/micromips-ase-directive.s
index 8cdcdcc0c56..f3ac60057dc 100644
--- a/llvm/test/MC/Mips/micromips-ase-directive.s
+++ b/llvm/test/MC/Mips/micromips-ase-directive.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple=mips-unknown-linux -filetype=obj %s -o - | \
-# RUN: llvm-readobj -mips-abi-flags | \
+# RUN: llvm-readobj --mips-abi-flags | \
# RUN: FileCheck --check-prefix=ASE-MICROMIPS %s
.set micromips
diff --git a/llvm/test/MC/Mips/mips-cop0-reginfo.s b/llvm/test/MC/Mips/mips-cop0-reginfo.s
index b75b0171fa3..3b4c5afb2e0 100644
--- a/llvm/test/MC/Mips/mips-cop0-reginfo.s
+++ b/llvm/test/MC/Mips/mips-cop0-reginfo.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple mips-unknown-linux-gnu -mcpu=mips32r2 -filetype=obj %s -o - \
-# RUN: | llvm-readobj -sections -section-data - | FileCheck %s
+# RUN: | llvm-readobj --sections --section-data - | FileCheck %s
mfc0 $16, $15, 1
mfc0 $16, $16, 1
diff --git a/llvm/test/MC/Mips/mips-data-directives.s b/llvm/test/MC/Mips/mips-data-directives.s
index 390f463c7cb..1fbbc8be4d4 100644
--- a/llvm/test/MC/Mips/mips-data-directives.s
+++ b/llvm/test/MC/Mips/mips-data-directives.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .4byte 3735929054
diff --git a/llvm/test/MC/Mips/mips-pdr.s b/llvm/test/MC/Mips/mips-pdr.s
index b19dca3148d..267800ebcd5 100644
--- a/llvm/test/MC/Mips/mips-pdr.s
+++ b/llvm/test/MC/Mips/mips-pdr.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=ASMOUT
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj -s -section-data -r | \
+# RUN: llvm-readobj -S --section-data -r | \
# RUN: FileCheck %s -check-prefix=OBJOUT
# ASMOUT: .text
diff --git a/llvm/test/MC/Mips/mips-rdata.s b/llvm/test/MC/Mips/mips-rdata.s
index 89f96195297..d2d8aa8c14a 100644
--- a/llvm/test/MC/Mips/mips-rdata.s
+++ b/llvm/test/MC/Mips/mips-rdata.s
@@ -1,7 +1,7 @@
# Check that .rdata sections have proper name, flags, and section types.
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o - \
-# RUN: | llvm-readobj -s | FileCheck %s
+# RUN: | llvm-readobj -S | FileCheck %s
.rdata
.word 0
diff --git a/llvm/test/MC/Mips/mips-reginfo-fp32.s b/llvm/test/MC/Mips/mips-reginfo-fp32.s
index 5b31884ec16..6b7d94aa57a 100644
--- a/llvm/test/MC/Mips/mips-reginfo-fp32.s
+++ b/llvm/test/MC/Mips/mips-reginfo-fp32.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj -s -section-data | \
+# RUN: llvm-readobj -S --section-data | \
# RUN: FileCheck %s
# CHECK: Section {
diff --git a/llvm/test/MC/Mips/mips-reginfo-fp64.s b/llvm/test/MC/Mips/mips-reginfo-fp64.s
index ba2bf797394..157801d3cec 100644
--- a/llvm/test/MC/Mips/mips-reginfo-fp64.s
+++ b/llvm/test/MC/Mips/mips-reginfo-fp64.s
@@ -1,13 +1,13 @@
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -mattr=+msa,+fp64 -filetype=obj -o - | \
-# RUN: llvm-readobj -s -section-data | \
+# RUN: llvm-readobj -S --section-data | \
# RUN: FileCheck %s -check-prefix=ELF32
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -target-abi n32 -filetype=obj -o - | \
-# RUN: llvm-readobj -s -section-data | \
+# RUN: llvm-readobj -S --section-data | \
# RUN: FileCheck %s -check-prefix=ELF32
# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -target-abi n64 -filetype=obj -o - | \
-# RUN: llvm-readobj -s -section-data | \
+# RUN: llvm-readobj -S --section-data | \
# RUN: FileCheck %s -check-prefix=ELF64
# ELF32: Section {
diff --git a/llvm/test/MC/Mips/mips32/abiflags.s b/llvm/test/MC/Mips/mips32/abiflags.s
index c8d74c1b703..a64335b69ac 100644
--- a/llvm/test/MC/Mips/mips32/abiflags.s
+++ b/llvm/test/MC/Mips/mips32/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=32
diff --git a/llvm/test/MC/Mips/mips32r2/abiflags.s b/llvm/test/MC/Mips/mips32r2/abiflags.s
index 200a8025e8d..46c54384f00 100644
--- a/llvm/test/MC/Mips/mips32r2/abiflags.s
+++ b/llvm/test/MC/Mips/mips32r2/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=32
diff --git a/llvm/test/MC/Mips/mips32r3/abiflags.s b/llvm/test/MC/Mips/mips32r3/abiflags.s
index 4d691453262..92ca0058069 100644
--- a/llvm/test/MC/Mips/mips32r3/abiflags.s
+++ b/llvm/test/MC/Mips/mips32r3/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r3 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=32
diff --git a/llvm/test/MC/Mips/mips32r5/abiflags.s b/llvm/test/MC/Mips/mips32r5/abiflags.s
index ab2a8579043..2e29338a7db 100644
--- a/llvm/test/MC/Mips/mips32r5/abiflags.s
+++ b/llvm/test/MC/Mips/mips32r5/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r5 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=32
diff --git a/llvm/test/MC/Mips/mips64/abiflags.s b/llvm/test/MC/Mips/mips64/abiflags.s
index 10c768942a1..bccfa775ddb 100644
--- a/llvm/test/MC/Mips/mips64/abiflags.s
+++ b/llvm/test/MC/Mips/mips64/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n64 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=64
diff --git a/llvm/test/MC/Mips/mips64eb-fixups.s b/llvm/test/MC/Mips/mips64eb-fixups.s
index 1ca8b0ae529..2de804d26e1 100644
--- a/llvm/test/MC/Mips/mips64eb-fixups.s
+++ b/llvm/test/MC/Mips/mips64eb-fixups.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple mips64eb-unknown-freebsd %s -o - | llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple mips64eb-unknown-freebsd %s -o - | llvm-readobj -S --sd | FileCheck %s
.section .fixups,"",@progbits
.byte 0xff
diff --git a/llvm/test/MC/Mips/mips64r2/abiflags.s b/llvm/test/MC/Mips/mips64r2/abiflags.s
index ece133f8f0e..799411d5afe 100644
--- a/llvm/test/MC/Mips/mips64r2/abiflags.s
+++ b/llvm/test/MC/Mips/mips64r2/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips64r2 -target-abi n64 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=64
diff --git a/llvm/test/MC/Mips/mips64r3/abiflags.s b/llvm/test/MC/Mips/mips64r3/abiflags.s
index e1461ccb3cb..71da8e970be 100644
--- a/llvm/test/MC/Mips/mips64r3/abiflags.s
+++ b/llvm/test/MC/Mips/mips64r3/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips64r3 -target-abi n64 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=64
diff --git a/llvm/test/MC/Mips/mips64r5/abiflags.s b/llvm/test/MC/Mips/mips64r5/abiflags.s
index 7972f5837de..71253eeb413 100644
--- a/llvm/test/MC/Mips/mips64r5/abiflags.s
+++ b/llvm/test/MC/Mips/mips64r5/abiflags.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips64r5 -target-abi n64 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=64
diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx.s b/llvm/test/MC/Mips/mips_abi_flags_xx.s
index fb27192b2a9..94101ae0c8f 100644
--- a/llvm/test/MC/Mips/mips_abi_flags_xx.s
+++ b/llvm/test/MC/Mips/mips_abi_flags_xx.s
@@ -2,19 +2,19 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS
# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mattr=fpxx -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS
# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mcpu=mips32r6 -mattr=fpxx -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R6,CHECK-OBJ-MIPS
# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -mcpu=octeon -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-64R2,CHECK-OBJ-OCTEON
# CHECK-ASM: .module fp=xx
diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
index b38d1b9a49d..f2445eba777 100644
--- a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
+++ b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=xx
diff --git a/llvm/test/MC/Mips/module-hardfloat.s b/llvm/test/MC/Mips/module-hardfloat.s
index 8a54fa69dd6..f29fbc09353 100644
--- a/llvm/test/MC/Mips/module-hardfloat.s
+++ b/llvm/test/MC/Mips/module-hardfloat.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module hardfloat
diff --git a/llvm/test/MC/Mips/module-softfloat.s b/llvm/test/MC/Mips/module-softfloat.s
index 18559c5aec1..77e62e38e20 100644
--- a/llvm/test/MC/Mips/module-softfloat.s
+++ b/llvm/test/MC/Mips/module-softfloat.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module softfloat
diff --git a/llvm/test/MC/Mips/msa/abiflags.s b/llvm/test/MC/Mips/msa/abiflags.s
index d4d8cadb8f2..4bd9725bdc4 100644
--- a/llvm/test/MC/Mips/msa/abiflags.s
+++ b/llvm/test/MC/Mips/msa/abiflags.s
@@ -3,7 +3,7 @@
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 -mattr=+msa \
# RUN: -filetype=obj -o - \
-# RUN: | llvm-readobj -sections -section-data -section-relocations - \
+# RUN: | llvm-readobj --sections --section-data --section-relocations - \
# RUN: | FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module fp=32
diff --git a/llvm/test/MC/Mips/mt/abiflag.s b/llvm/test/MC/Mips/mt/abiflag.s
index b4769cba4c2..2d03c5d1106 100644
--- a/llvm/test/MC/Mips/mt/abiflag.s
+++ b/llvm/test/MC/Mips/mt/abiflag.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -mattr=+mt -filetype=obj -o - \
-# RUN: | llvm-readobj -mips-abi-flags | FileCheck %s
+# RUN: | llvm-readobj --mips-abi-flags | FileCheck %s
# Test that the usage of the MT ASE is recorded in .MIPS.abiflags
diff --git a/llvm/test/MC/Mips/mt/module-directive.s b/llvm/test/MC/Mips/mt/module-directive.s
index d316f054eaa..0d9ab97b455 100644
--- a/llvm/test/MC/Mips/mt/module-directive.s
+++ b/llvm/test/MC/Mips/mt/module-directive.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj -mips-abi-flags | FileCheck --check-prefix=CHECK-OBJ %s
+# RUN: llvm-readobj --mips-abi-flags | FileCheck --check-prefix=CHECK-OBJ %s
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=asm -o - | \
# RUN: FileCheck --check-prefix=CHECK-ASM %s
diff --git a/llvm/test/MC/Mips/mt/set-directive.s b/llvm/test/MC/Mips/mt/set-directive.s
index 53ed4b27379..9088655d8c5 100644
--- a/llvm/test/MC/Mips/mt/set-directive.s
+++ b/llvm/test/MC/Mips/mt/set-directive.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \
-# RUN: llvm-readobj -mips-abi-flags | FileCheck %s --check-prefix=CHECK-OBJ
+# RUN: llvm-readobj --mips-abi-flags | FileCheck %s --check-prefix=CHECK-OBJ
# RUN: llvm-mc < %s -arch=mips -mcpu=mips32r2 -filetype=asm -o - | \
# RUN: FileCheck %s --check-prefix=CHECK-ASM
diff --git a/llvm/test/MC/Mips/nooddspreg-cmdarg.s b/llvm/test/MC/Mips/nooddspreg-cmdarg.s
index 3bbb8e893e6..2ccce74a5f1 100644
--- a/llvm/test/MC/Mips/nooddspreg-cmdarg.s
+++ b/llvm/test/MC/Mips/nooddspreg-cmdarg.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64,+nooddspreg -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -mattr=+nooddspreg 2> %t0
diff --git a/llvm/test/MC/Mips/nooddspreg.s b/llvm/test/MC/Mips/nooddspreg.s
index a5530ef8f52..6511da78657 100644
--- a/llvm/test/MC/Mips/nooddspreg.s
+++ b/llvm/test/MC/Mips/nooddspreg.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnuabin32 2> %t1
diff --git a/llvm/test/MC/Mips/oddspreg.s b/llvm/test/MC/Mips/oddspreg.s
index c65a27d0828..204ff2c2808 100644
--- a/llvm/test/MC/Mips/oddspreg.s
+++ b/llvm/test/MC/Mips/oddspreg.s
@@ -2,14 +2,14 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-O32
#
# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 | \
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32
# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu | \
@@ -18,19 +18,19 @@
# Repeat the -filetype=obj tests but this time use an empty assembly file. The
# output should be unchanged.
# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N64
# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-O32
#
# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnuabin32 -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32
# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -filetype=obj -o - | \
-# RUN: llvm-readobj -sections -section-data -section-relocations - | \
+# RUN: llvm-readobj --sections --section-data --section-relocations - | \
# RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N64
# CHECK-ASM: .module oddspreg
diff --git a/llvm/test/MC/Mips/reloc-directive.s b/llvm/test/MC/Mips/reloc-directive.s
index bf7c91b851f..b7498105681 100644
--- a/llvm/test/MC/Mips/reloc-directive.s
+++ b/llvm/test/MC/Mips/reloc-directive.s
@@ -5,13 +5,13 @@
# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n64 \
# RUN: | FileCheck -check-prefix=ASM %s
# RUN: llvm-mc -triple mips-unknown-linux < %s -show-encoding -target-abi=o32 \
-# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \
+# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \
# RUN: FileCheck -check-prefix=OBJ-O32 %s
# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n32 \
-# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \
+# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \
# RUN: FileCheck -check-prefix=OBJ-N32 %s
# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n64 \
-# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \
+# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \
# RUN: FileCheck -check-prefix=OBJ-N64 %s
.text
foo:
diff --git a/llvm/test/MC/Mips/relocation-n64.s b/llvm/test/MC/Mips/relocation-n64.s
index cb556e0866a..155ac20653a 100644
--- a/llvm/test/MC/Mips/relocation-n64.s
+++ b/llvm/test/MC/Mips/relocation-n64.s
@@ -5,7 +5,7 @@
// RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux < %s \
// RUN: | llvm-readobj -r | FileCheck -check-prefix=RELOC %s
// RUN: llvm-mc -filetype=obj -triple mips64-unknown-linux < %s \
-// RUN: | llvm-readobj -sections -section-data \
+// RUN: | llvm-readobj --sections --section-data \
// RUN: | FileCheck -check-prefix=DATA %s
// Test that we produce the correct relocation.
diff --git a/llvm/test/MC/Mips/relocation-xfail.s b/llvm/test/MC/Mips/relocation-xfail.s
index dcb78beb413..25db54a727e 100644
--- a/llvm/test/MC/Mips/relocation-xfail.s
+++ b/llvm/test/MC/Mips/relocation-xfail.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -filetype=obj -triple mips-unknown-linux -mattr=+micromips < %s \
-// RUN: | llvm-readobj -sections -section-data \
+// RUN: | llvm-readobj --sections --section-data \
// RUN: | FileCheck -check-prefix=DATA %s
//
// XFAIL: *
diff --git a/llvm/test/MC/Mips/relocation.s b/llvm/test/MC/Mips/relocation.s
index aa36b873bfc..0ff450b24a0 100644
--- a/llvm/test/MC/Mips/relocation.s
+++ b/llvm/test/MC/Mips/relocation.s
@@ -5,7 +5,7 @@
// RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux < %s \
// RUN: | llvm-readobj -r | FileCheck -check-prefix=RELOC %s
// RUN: llvm-mc -filetype=obj -triple mips-unknown-linux < %s \
-// RUN: | llvm-readobj -sections -section-data \
+// RUN: | llvm-readobj --sections --section-data \
// RUN: | FileCheck -check-prefix=DATA %s
// Test that we produce the correct relocation.
diff --git a/llvm/test/MC/Mips/section-size.s b/llvm/test/MC/Mips/section-size.s
index f6ffa8fe2de..1d3319cbf09 100644
--- a/llvm/test/MC/Mips/section-size.s
+++ b/llvm/test/MC/Mips/section-size.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple mips-unknown-linux -filetype=obj \
-# RUN: -mips-round-section-sizes %s | llvm-readobj -sections | FileCheck %s
+# RUN: -mips-round-section-sizes %s | llvm-readobj --sections | FileCheck %s
.section ".talign1", "ax"
.p2align 4
t1: .byte 1
diff --git a/llvm/test/MC/Mips/sym-offset.ll b/llvm/test/MC/Mips/sym-offset.ll
index 55adc22d971..c5a063b8795 100644
--- a/llvm/test/MC/Mips/sym-offset.ll
+++ b/llvm/test/MC/Mips/sym-offset.ll
@@ -1,4 +1,4 @@
-; DISABLED: llc -filetype=obj -mtriple mipsel-unknown-linux %s -o - | llvm-readobj -s -sd | FileCheck %s
+; DISABLED: llc -filetype=obj -mtriple mipsel-unknown-linux %s -o - | llvm-readobj -S --sd | FileCheck %s
; RUN: false
; XFAIL: *
diff --git a/llvm/test/MC/Mips/virt/module-novirt.s b/llvm/test/MC/Mips/virt/module-novirt.s
index 53c04599e8f..0f531dbbc80 100644
--- a/llvm/test/MC/Mips/virt/module-novirt.s
+++ b/llvm/test/MC/Mips/virt/module-novirt.s
@@ -2,7 +2,7 @@
# RUN: FileCheck %s -check-prefix=CHECK-ASM
#
# RUN: llvm-mc %s -arch=mips -mcpu=mips32r5 -filetype=obj -o - -mattr=+virt | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module novirt
diff --git a/llvm/test/MC/Mips/virt/module-virt.s b/llvm/test/MC/Mips/virt/module-virt.s
index 9a025ed7ed4..ae38b83d848 100644
--- a/llvm/test/MC/Mips/virt/module-virt.s
+++ b/llvm/test/MC/Mips/virt/module-virt.s
@@ -3,7 +3,7 @@
#
# RUN: llvm-mc %s -triple=mips-unknown-linux-gnu -mcpu=mips32r5 \
# RUN: -filetype=obj -o - | \
-# RUN: llvm-readobj -mips-abi-flags - | \
+# RUN: llvm-readobj --mips-abi-flags - | \
# RUN: FileCheck %s -check-prefix=CHECK-OBJ
# CHECK-ASM: .module virt
diff --git a/llvm/test/MC/PowerPC/lcomm.s b/llvm/test/MC/PowerPC/lcomm.s
index a84f138479b..cc62332378e 100644
--- a/llvm/test/MC/PowerPC/lcomm.s
+++ b/llvm/test/MC/PowerPC/lcomm.s
@@ -1,7 +1,7 @@
# RUN: llvm-mc -triple powerpc-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
# RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
.lcomm foo, 16, 16
diff --git a/llvm/test/MC/PowerPC/ppc-llong.s b/llvm/test/MC/PowerPC/ppc-llong.s
index bbe0c95a084..8b7bf133dd0 100644
--- a/llvm/test/MC/PowerPC/ppc-llong.s
+++ b/llvm/test/MC/PowerPC/ppc-llong.s
@@ -1,10 +1,10 @@
# RUN: llvm-mc -triple powerpc-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
# RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
# RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
.data
.llong 0
diff --git a/llvm/test/MC/PowerPC/ppc-nop.s b/llvm/test/MC/PowerPC/ppc-nop.s
index 29fd8e4f748..8cc2f177cc8 100644
--- a/llvm/test/MC/PowerPC/ppc-nop.s
+++ b/llvm/test/MC/PowerPC/ppc-nop.s
@@ -1,6 +1,6 @@
-# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux-gnu %s | llvm-readobj -s -sd - | FileCheck -check-prefix=CHECK-BE %s
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux-gnu %s | llvm-readobj -s -sd - | FileCheck -check-prefix=CHECK-BE %s
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux-gnu %s | llvm-readobj -s -sd - | FileCheck -check-prefix=CHECK-LE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux-gnu %s | llvm-readobj -S --sd - | FileCheck -check-prefix=CHECK-BE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux-gnu %s | llvm-readobj -S --sd - | FileCheck -check-prefix=CHECK-BE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux-gnu %s | llvm-readobj -S --sd - | FileCheck -check-prefix=CHECK-LE %s
blr
.p2align 3
diff --git a/llvm/test/MC/PowerPC/ppc-word.s b/llvm/test/MC/PowerPC/ppc-word.s
index c52129c57cd..aade96a6437 100644
--- a/llvm/test/MC/PowerPC/ppc-word.s
+++ b/llvm/test/MC/PowerPC/ppc-word.s
@@ -1,10 +1,10 @@
# RUN: llvm-mc -triple powerpc-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
# RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
# RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
.data
.word 0
diff --git a/llvm/test/MC/PowerPC/ppc64-fixup-apply.s b/llvm/test/MC/PowerPC/ppc64-fixup-apply.s
index d16c9f20380..fd449c4e6c8 100644
--- a/llvm/test/MC/PowerPC/ppc64-fixup-apply.s
+++ b/llvm/test/MC/PowerPC/ppc64-fixup-apply.s
@@ -1,8 +1,8 @@
# RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-BE %s
+# RUN: llvm-readobj -S --sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-BE %s
# RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-LE %s
+# RUN: llvm-readobj -S --sd | FileCheck -check-prefix=CHECK -check-prefix=CHECK-LE %s
# This checks that fixups that can be resolved within the same
# object file are applied correctly.
diff --git a/llvm/test/MC/PowerPC/ppc64-initial-cfa.s b/llvm/test/MC/PowerPC/ppc64-initial-cfa.s
index 819cd1114ae..39567f59659 100644
--- a/llvm/test/MC/PowerPC/ppc64-initial-cfa.s
+++ b/llvm/test/MC/PowerPC/ppc64-initial-cfa.s
@@ -1,11 +1,11 @@
# RUN: llvm-mc -triple=powerpc64-unknown-linux-gnu -filetype=obj %s | \
-# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-BE
+# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-BE
# RUN: llvm-mc -triple=powerpc64-unknown-linux-gnu -filetype=obj %s | \
-# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-BE
+# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-BE
# RUN: llvm-mc -triple=powerpc64le-unknown-linux-gnu -filetype=obj %s | \
-# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-LE
+# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=STATIC -check-prefix=STATIC-LE
# RUN: llvm-mc -triple=powerpc64le-unknown-linux-gnu -filetype=obj %s | \
-# RUN: llvm-readobj -s -sr -sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-LE
+# RUN: llvm-readobj -S --sr --sd | FileCheck %s -check-prefix=PIC -check-prefix=PIC-LE
_proc:
.cfi_startproc
diff --git a/llvm/test/MC/PowerPC/ppc64-localentry.s b/llvm/test/MC/PowerPC/ppc64-localentry.s
index cc1de288fc1..883b2fcc38e 100644
--- a/llvm/test/MC/PowerPC/ppc64-localentry.s
+++ b/llvm/test/MC/PowerPC/ppc64-localentry.s
@@ -1,8 +1,8 @@
# RUN: llvm-mc -triple powerpc64-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -h -r -symbols | FileCheck %s
+# RUN: llvm-readobj -h -r --symbols | FileCheck %s
# RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \
-# RUN: llvm-readobj -h -r -symbols | FileCheck %s
+# RUN: llvm-readobj -h -r --symbols | FileCheck %s
.type callee1, @function
callee1:
diff --git a/llvm/test/MC/RISCV/elf-flags.s b/llvm/test/MC/RISCV/elf-flags.s
index 347f11adf4a..7e17377b34d 100644
--- a/llvm/test/MC/RISCV/elf-flags.s
+++ b/llvm/test/MC/RISCV/elf-flags.s
@@ -1,9 +1,9 @@
-# RUN: llvm-mc -triple=riscv32 -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVI %s
-# RUN: llvm-mc -triple=riscv64 -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVI %s
-# RUN: llvm-mc -triple=riscv32 -mattr=+c -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s
-# RUN: llvm-mc -triple=riscv64 -mattr=+c -filetype=obj < %s | llvm-readobj -file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s
+# RUN: llvm-mc -triple=riscv32 -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVI %s
+# RUN: llvm-mc -triple=riscv64 -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVI %s
+# RUN: llvm-mc -triple=riscv32 -mattr=+c -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s
+# RUN: llvm-mc -triple=riscv64 -mattr=+c -filetype=obj < %s | llvm-readobj --file-headers - | FileCheck -check-prefixes=CHECK-RVIC %s
# RUN: llvm-mc -triple=riscv32 -mattr=+e -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-RVE %s
# CHECK-RVI: Flags [ (0x0)
diff --git a/llvm/test/MC/RISCV/target-abi-valid.s b/llvm/test/MC/RISCV/target-abi-valid.s
index 985d1741567..dab4420d024 100644
--- a/llvm/test/MC/RISCV/target-abi-valid.s
+++ b/llvm/test/MC/RISCV/target-abi-valid.s
@@ -1,50 +1,50 @@
# RUN: llvm-mc -triple=riscv32 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv32 -target-abi ilp32 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv32 -mattr=+f -target-abi ilp32 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv32 -mattr=+d -target-abi ilp32 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv64 -target-abi lp64 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv64 -mattr=+f -target-abi lp64 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv64 -mattr=+d -target-abi lp64 -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-NONE %s
# RUN: llvm-mc -triple=riscv32 -mattr=+f -target-abi ilp32f -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s
# RUN: llvm-mc -triple=riscv32 -mattr=+d -target-abi ilp32f -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s
# RUN: llvm-mc -triple=riscv64 -mattr=+f -target-abi lp64f -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s
# RUN: llvm-mc -triple=riscv64 -mattr=+d -target-abi lp64f -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-FLOAT-SINGLE %s
# RUN: llvm-mc -triple=riscv32 -mattr=+d -target-abi ilp32d -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-FLOAT-DOUBLE %s
# RUN: llvm-mc -triple=riscv64 -mattr=+d -target-abi lp64d -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-FLOAT-DOUBLE %s
# RUN: llvm-mc -triple=riscv32 -target-abi ilp32e -filetype=obj < %s \
-# RUN: | llvm-readobj -file-headers - \
+# RUN: | llvm-readobj --file-headers - \
# RUN: | FileCheck -check-prefix=CHECK-RVE %s
# CHECK-NONE: Flags [ (0x0)
diff --git a/llvm/test/MC/Sparc/sparc-nop-data.s b/llvm/test/MC/Sparc/sparc-nop-data.s
index 1538505af73..2ba8cd43b36 100644
--- a/llvm/test/MC/Sparc/sparc-nop-data.s
+++ b/llvm/test/MC/Sparc/sparc-nop-data.s
@@ -1,5 +1,5 @@
-! RUN: llvm-mc %s -arch=sparc -filetype=obj | llvm-readobj -s -sd | FileCheck %s
-! RUN: llvm-mc %s -arch=sparcv9 -filetype=obj | llvm-readobj -s -sd | FileCheck %s
+! RUN: llvm-mc %s -arch=sparc -filetype=obj | llvm-readobj -S --sd | FileCheck %s
+! RUN: llvm-mc %s -arch=sparcv9 -filetype=obj | llvm-readobj -S --sd | FileCheck %s
! CHECK: 0000: BA1F401D 01000000 01000000 01000000
! CHECK: 0010: BA1F401D
diff --git a/llvm/test/MC/SystemZ/word.s b/llvm/test/MC/SystemZ/word.s
index 70f009a1e85..6299101bc3c 100644
--- a/llvm/test/MC/SystemZ/word.s
+++ b/llvm/test/MC/SystemZ/word.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple s390x-linux-gnu -filetype=obj %s | \
-# RUN: llvm-readobj -s -sd | FileCheck %s
+# RUN: llvm-readobj -S --sd | FileCheck %s
.section word, "aw"
.word 0xabcd
diff --git a/llvm/test/MC/WebAssembly/custom-sections.ll b/llvm/test/MC/WebAssembly/custom-sections.ll
index f662d55352b..d0fc5df9977 100644
--- a/llvm/test/MC/WebAssembly/custom-sections.ll
+++ b/llvm/test/MC/WebAssembly/custom-sections.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s
+; RUN: llc -filetype=obj %s -o - | llvm-readobj -S | FileCheck %s
; Test the mechanism for defining user custom sections.
diff --git a/llvm/test/MC/WebAssembly/debug-info.ll b/llvm/test/MC/WebAssembly/debug-info.ll
index d0c49b7c836..0d78f97fbb2 100644
--- a/llvm/test/MC/WebAssembly/debug-info.ll
+++ b/llvm/test/MC/WebAssembly/debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj %s -o - | llvm-readobj -r -s -symbols | FileCheck %s
+; RUN: llc -filetype=obj %s -o - | llvm-readobj -r -S --symbols | FileCheck %s
; CHECK: Format: WASM
; CHECK-NEXT:Arch: wasm32
diff --git a/llvm/test/MC/WebAssembly/event-section.ll b/llvm/test/MC/WebAssembly/event-section.ll
index b42ddd20570..2b5b5bba9fe 100644
--- a/llvm/test/MC/WebAssembly/event-section.ll
+++ b/llvm/test/MC/WebAssembly/event-section.ll
@@ -1,5 +1,5 @@
; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o - | obj2yaml | FileCheck %s
-; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o - | llvm-readobj -s | FileCheck -check-prefix=SEC %s
+; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o - | llvm-readobj -S | FileCheck -check-prefix=SEC %s
target triple = "wasm32-unknown-unknown"
diff --git a/llvm/test/MC/WebAssembly/file-headers.ll b/llvm/test/MC/WebAssembly/file-headers.ll
index ae6bc88b996..ff738f8066c 100644
--- a/llvm/test/MC/WebAssembly/file-headers.ll
+++ b/llvm/test/MC/WebAssembly/file-headers.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj %s -o - | llvm-readobj -file-headers | FileCheck %s
+; RUN: llc -filetype=obj %s -o - | llvm-readobj --file-headers | FileCheck %s
target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
target triple = "wasm32-unknown-unknown"
diff --git a/llvm/test/MC/WebAssembly/func-address.ll b/llvm/test/MC/WebAssembly/func-address.ll
index e7bea2808f3..c5eb0ea5938 100644
--- a/llvm/test/MC/WebAssembly/func-address.ll
+++ b/llvm/test/MC/WebAssembly/func-address.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O2 -filetype=obj %s -o - | llvm-readobj -r -s -expand-relocs | FileCheck %s
+; RUN: llc -O2 -filetype=obj %s -o - | llvm-readobj -r -S --expand-relocs | FileCheck %s
target triple = "wasm32-unknown-unknown"
diff --git a/llvm/test/MC/WebAssembly/function-alias.ll b/llvm/test/MC/WebAssembly/function-alias.ll
index 9fc91b6a8e2..a6a44ab0bd0 100644
--- a/llvm/test/MC/WebAssembly/function-alias.ll
+++ b/llvm/test/MC/WebAssembly/function-alias.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj %s -o - | llvm-readobj -symbols | FileCheck %s
+; RUN: llc -filetype=obj %s -o - | llvm-readobj --symbols | FileCheck %s
target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
target triple = "wasm32-unknown-unknown-wasm"
diff --git a/llvm/test/MC/WebAssembly/reloc-code.ll b/llvm/test/MC/WebAssembly/reloc-code.ll
index c16de2ec2a6..2c2cbba0bd9 100644
--- a/llvm/test/MC/WebAssembly/reloc-code.ll
+++ b/llvm/test/MC/WebAssembly/reloc-code.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj -wasm-keep-registers %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s
+; RUN: llc -filetype=obj -wasm-keep-registers %s -o - | llvm-readobj -r --expand-relocs | FileCheck %s
target triple = "wasm32-unknown-unknown"
diff --git a/llvm/test/MC/WebAssembly/reloc-data.ll b/llvm/test/MC/WebAssembly/reloc-data.ll
index aedaa4e58ff..124db881b2f 100644
--- a/llvm/test/MC/WebAssembly/reloc-data.ll
+++ b/llvm/test/MC/WebAssembly/reloc-data.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O0 -filetype=obj %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s
+; RUN: llc -O0 -filetype=obj %s -o - | llvm-readobj -r --expand-relocs | FileCheck %s
target triple = "wasm32-unknown-unknown"
diff --git a/llvm/test/MC/WebAssembly/sections.ll b/llvm/test/MC/WebAssembly/sections.ll
index 9dc7dbea8ed..abc1fe48607 100644
--- a/llvm/test/MC/WebAssembly/sections.ll
+++ b/llvm/test/MC/WebAssembly/sections.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s
+; RUN: llc -filetype=obj %s -o - | llvm-readobj -S | FileCheck %s
target triple = "wasm32-unknown-unknown"
diff --git a/llvm/test/MC/X86/AlignedBundling/section-alignment.s b/llvm/test/MC/X86/AlignedBundling/section-alignment.s
index 9ee5f6776c1..5cbe58e5675 100644
--- a/llvm/test/MC/X86/AlignedBundling/section-alignment.s
+++ b/llvm/test/MC/X86/AlignedBundling/section-alignment.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - \
-# RUN: | llvm-readobj -sections | FileCheck %s
+# RUN: | llvm-readobj --sections | FileCheck %s
# Test that bundle-aligned sections with instructions are aligned
diff --git a/llvm/test/MC/X86/cfi_def_cfa-crash.s b/llvm/test/MC/X86/cfi_def_cfa-crash.s
index 74b41d9943a..61a03e1e4c5 100644
--- a/llvm/test/MC/X86/cfi_def_cfa-crash.s
+++ b/llvm/test/MC/X86/cfi_def_cfa-crash.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - | llvm-readobj -sections | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin -filetype=obj %s -o - | llvm-readobj --sections | FileCheck %s
// We were trying to generate compact unwind info for assembly like this.
// The .cfi_def_cfa directive, however, throws a wrench into that and was
diff --git a/llvm/test/MC/X86/eval-fill.s b/llvm/test/MC/X86/eval-fill.s
index f09166ee0f1..838eedf5e17 100644
--- a/llvm/test/MC/X86/eval-fill.s
+++ b/llvm/test/MC/X86/eval-fill.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj %s -o - -triple x86_64-pc-linux | llvm-readobj -S | FileCheck %s
// CHECK: Name: .text
// CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/llvm/test/MC/X86/fp-setup-macho.s b/llvm/test/MC/X86/fp-setup-macho.s
index aaae07a48c0..4bfff129f19 100644
--- a/llvm/test/MC/X86/fp-setup-macho.s
+++ b/llvm/test/MC/X86/fp-setup-macho.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-macho -filetype obj -o - %s | llvm-readobj -sections | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-macho -filetype obj -o - %s | llvm-readobj --sections | FileCheck %s
_label:
.cfi_startproc
diff --git a/llvm/test/MC/X86/large-bss.s b/llvm/test/MC/X86/large-bss.s
index edb111e9092..97fcc5de704 100644
--- a/llvm/test/MC/X86/large-bss.s
+++ b/llvm/test/MC/X86/large-bss.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-pc-linux -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-linux -filetype=obj %s -o - | llvm-readobj -S | FileCheck %s
.bss
.zero 0x10000000000000
diff --git a/llvm/test/MC/X86/no-elf-compact-unwind.s b/llvm/test/MC/X86/no-elf-compact-unwind.s
index 4e9236b8797..e61c24c141a 100644
--- a/llvm/test/MC/X86/no-elf-compact-unwind.s
+++ b/llvm/test/MC/X86/no-elf-compact-unwind.s
@@ -1,6 +1,6 @@
-// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-macosx10.8.0 | llvm-readobj -s | FileCheck -check-prefix=MACHO %s
-// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-ios7.0.0 | llvm-readobj -s | FileCheck -check-prefix=MACHO %s
-// RUN: llvm-mc < %s -filetype=obj -triple x86_64-unknown-linux | llvm-readobj -s | FileCheck -check-prefix=ELF %s
+// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-macosx10.8.0 | llvm-readobj -S | FileCheck -check-prefix=MACHO %s
+// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-ios7.0.0 | llvm-readobj -S | FileCheck -check-prefix=MACHO %s
+// RUN: llvm-mc < %s -filetype=obj -triple x86_64-unknown-linux | llvm-readobj -S | FileCheck -check-prefix=ELF %s
.globl __Z3barv
.align 4, 0x90
diff --git a/llvm/test/MC/X86/reloc-directive.s b/llvm/test/MC/X86/reloc-directive.s
index 901427a6ab6..124f5209628 100644
--- a/llvm/test/MC/X86/reloc-directive.s
+++ b/llvm/test/MC/X86/reloc-directive.s
@@ -1,10 +1,10 @@
# RUN: llvm-mc -triple i686-pc-win32 < %s -show-encoding \
# RUN: | FileCheck -check-prefix=ASM %s
# RUN: llvm-mc -triple i686-pc-win32 < %s -show-encoding \
-# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \
+# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \
# RUN: FileCheck -check-prefix=OBJ-32 %s
# RUN: llvm-mc -triple x86_64-pc-win32 < %s -show-encoding \
-# RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \
+# RUN: -filetype=obj | llvm-readobj --sections --section-data -r | \
# RUN: FileCheck -check-prefix=OBJ-64 %s
.text
foo:
diff --git a/llvm/test/MC/X86/x86-evenDirective.s b/llvm/test/MC/X86/x86-evenDirective.s
index 6d6555e7077..d59ae903e2d 100644
--- a/llvm/test/MC/X86/x86-evenDirective.s
+++ b/llvm/test/MC/X86/x86-evenDirective.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple -x86_64-unknown-unknown -filetype obj -o - %s | llvm-readobj -s -sd \
+# RUN: llvm-mc -triple -x86_64-unknown-unknown -filetype obj -o - %s | llvm-readobj -S --sd \
# RUN: | FileCheck %s
.text
OpenPOWER on IntegriCloud