[lld] r359651 - [test] Change llvm-readobj -long-option to --long-option or well-known short options. NFC

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Tue Apr 30 22:49:03 PDT 2019


Author: maskray
Date: Tue Apr 30 22:49:01 2019
New Revision: 359651

URL: http://llvm.org/viewvc/llvm-project?rev=359651&view=rev
Log:
[test] Change llvm-readobj -long-option to --long-option or well-known short options. NFC

Also change some options that have different semantics (cause confusion) in llvm-readelf mode:

-s => -S
-t => --symbols
-sd => --section-data

Modified:
    lld/trunk/test/COFF/arm64-delayimport.yaml
    lld/trunk/test/COFF/arm64-import2.test
    lld/trunk/test/COFF/arm64-magic.yaml
    lld/trunk/test/COFF/armnt-entry-point.test
    lld/trunk/test/COFF/armnt-imports.test
    lld/trunk/test/COFF/associative-comdat-mingw.s
    lld/trunk/test/COFF/associative-comdat.s
    lld/trunk/test/COFF/autoimport-arm-data.s
    lld/trunk/test/COFF/autoimport-arm64-data.s
    lld/trunk/test/COFF/autoimport-gnu-implib.s
    lld/trunk/test/COFF/autoimport-refptr.s
    lld/trunk/test/COFF/autoimport-x86.s
    lld/trunk/test/COFF/base.test
    lld/trunk/test/COFF/baserel.test
    lld/trunk/test/COFF/combined-resources.test
    lld/trunk/test/COFF/common-replacement.s
    lld/trunk/test/COFF/constant-export.test
    lld/trunk/test/COFF/crt-chars.test
    lld/trunk/test/COFF/crt-dyn-initializer-order.test
    lld/trunk/test/COFF/debug-reloc.s
    lld/trunk/test/COFF/def-export-stdcall.s
    lld/trunk/test/COFF/delayimports-armnt.yaml
    lld/trunk/test/COFF/delayimports.test
    lld/trunk/test/COFF/delayimports32.test
    lld/trunk/test/COFF/dll.test
    lld/trunk/test/COFF/dllexport.s
    lld/trunk/test/COFF/dllimport-gc.test
    lld/trunk/test/COFF/entry-inference-mingw.s
    lld/trunk/test/COFF/exclude-all.s
    lld/trunk/test/COFF/export-all.s
    lld/trunk/test/COFF/export32.test
    lld/trunk/test/COFF/fixed.test
    lld/trunk/test/COFF/gfids-corrupt.s
    lld/trunk/test/COFF/gfids-export.s
    lld/trunk/test/COFF/gfids-fallback.s
    lld/trunk/test/COFF/gfids-gc.s
    lld/trunk/test/COFF/gfids-icf.s
    lld/trunk/test/COFF/gfids-relocations32.s
    lld/trunk/test/COFF/gfids-relocations64.s
    lld/trunk/test/COFF/guard-longjmp.s
    lld/trunk/test/COFF/guardcf-align.s
    lld/trunk/test/COFF/guardcf-lto.ll
    lld/trunk/test/COFF/guardcf-thunk.s
    lld/trunk/test/COFF/header-size.s
    lld/trunk/test/COFF/heap.test
    lld/trunk/test/COFF/hello32.test
    lld/trunk/test/COFF/icf-pdata.s
    lld/trunk/test/COFF/icf-xdata.s
    lld/trunk/test/COFF/imports-gnu-autoexport.s
    lld/trunk/test/COFF/imports-gnu.test
    lld/trunk/test/COFF/imports-mangle.test
    lld/trunk/test/COFF/imports.test
    lld/trunk/test/COFF/largeaddressaware.test
    lld/trunk/test/COFF/loadcfg.ll
    lld/trunk/test/COFF/loadcfg.test
    lld/trunk/test/COFF/loadcfg32.test
    lld/trunk/test/COFF/locally-imported-arm64.test
    lld/trunk/test/COFF/locally-imported.test
    lld/trunk/test/COFF/long-section-name.test
    lld/trunk/test/COFF/lto-comdat.ll
    lld/trunk/test/COFF/lto-icf.ll
    lld/trunk/test/COFF/lto.ll
    lld/trunk/test/COFF/machine.test
    lld/trunk/test/COFF/manifestinput.test
    lld/trunk/test/COFF/merge.test
    lld/trunk/test/COFF/no-idata.s
    lld/trunk/test/COFF/noentry.test
    lld/trunk/test/COFF/options.test
    lld/trunk/test/COFF/output-chars.test
    lld/trunk/test/COFF/pdb-exe-path-dots.test
    lld/trunk/test/COFF/pdbaltpath.test
    lld/trunk/test/COFF/resource.test
    lld/trunk/test/COFF/responsefile.test
    lld/trunk/test/COFF/rsds.test
    lld/trunk/test/COFF/safeseh-md.s
    lld/trunk/test/COFF/safeseh-notable.s
    lld/trunk/test/COFF/safeseh.s
    lld/trunk/test/COFF/section.test
    lld/trunk/test/COFF/sort-debug.test
    lld/trunk/test/COFF/stack.test
    lld/trunk/test/COFF/strtab-size.s
    lld/trunk/test/COFF/subsystem-drectve.test
    lld/trunk/test/COFF/subsystem-inference-mingw.s
    lld/trunk/test/COFF/subsystem-inference.test
    lld/trunk/test/COFF/subsystem-inference2.test
    lld/trunk/test/COFF/subsystem-inference32.test
    lld/trunk/test/COFF/subsystem.test
    lld/trunk/test/COFF/symtab-gc.s
    lld/trunk/test/COFF/symtab.test
    lld/trunk/test/COFF/timestamp.test
    lld/trunk/test/COFF/tls.test
    lld/trunk/test/COFF/tls32.test
    lld/trunk/test/COFF/unwind.test
    lld/trunk/test/COFF/version.test
    lld/trunk/test/ELF/aarch64-abs64-dyn.s
    lld/trunk/test/ELF/aarch64-condb-reloc.s
    lld/trunk/test/ELF/aarch64-copy.s
    lld/trunk/test/ELF/aarch64-copy2.s
    lld/trunk/test/ELF/aarch64-fpic-got.s
    lld/trunk/test/ELF/aarch64-gnu-ifunc-nosym.s
    lld/trunk/test/ELF/aarch64-gnu-ifunc-plt.s
    lld/trunk/test/ELF/aarch64-gnu-ifunc.s
    lld/trunk/test/ELF/aarch64-got-reloc.s
    lld/trunk/test/ELF/aarch64-got.s
    lld/trunk/test/ELF/aarch64-relro.s
    lld/trunk/test/ELF/aarch64-tls-gdie.s
    lld/trunk/test/ELF/aarch64-tls-gdle.s
    lld/trunk/test/ELF/aarch64-tls-ie.s
    lld/trunk/test/ELF/aarch64-tls-iele.s
    lld/trunk/test/ELF/aarch64-tls-le.s
    lld/trunk/test/ELF/aarch64-tls-static.s
    lld/trunk/test/ELF/aarch64-tstbr14-reloc.s
    lld/trunk/test/ELF/abs-hidden.s
    lld/trunk/test/ELF/amdgpu-abi-version.s
    lld/trunk/test/ELF/amdgpu-elf-flags.s
    lld/trunk/test/ELF/amdgpu-globals.s
    lld/trunk/test/ELF/amdgpu-kernels.s
    lld/trunk/test/ELF/arm-abs32-dyn.s
    lld/trunk/test/ELF/arm-attributes.s
    lld/trunk/test/ELF/arm-copy.s
    lld/trunk/test/ELF/arm-data-prel.s
    lld/trunk/test/ELF/arm-eabi-version.s
    lld/trunk/test/ELF/arm-exidx-discard.s
    lld/trunk/test/ELF/arm-exidx-link.s
    lld/trunk/test/ELF/arm-exidx-output.s
    lld/trunk/test/ELF/arm-exidx-relocatable.s
    lld/trunk/test/ELF/arm-exidx-sentinel-norelocatable.s
    lld/trunk/test/ELF/arm-exidx-synthetic-link.s
    lld/trunk/test/ELF/arm-fpic-got.s
    lld/trunk/test/ELF/arm-gnu-ifunc-nosym.s
    lld/trunk/test/ELF/arm-gnu-ifunc-plt.s
    lld/trunk/test/ELF/arm-gnu-ifunc.s
    lld/trunk/test/ELF/arm-got-relative.s
    lld/trunk/test/ELF/arm-gotoff.s
    lld/trunk/test/ELF/arm-plt-reloc.s
    lld/trunk/test/ELF/arm-tag-vfp-args.s
    lld/trunk/test/ELF/arm-thumb-interwork-thunk.s
    lld/trunk/test/ELF/arm-thumb-plt-reloc.s
    lld/trunk/test/ELF/arm-tls-gd32.s
    lld/trunk/test/ELF/arm-tls-ie32.s
    lld/trunk/test/ELF/arm-tls-ldm32.s
    lld/trunk/test/ELF/arm-tls-le32.s
    lld/trunk/test/ELF/arm-tls-norelax-gd-ie.s
    lld/trunk/test/ELF/as-needed.s
    lld/trunk/test/ELF/assignment-archive.s
    lld/trunk/test/ELF/avoid-empty-program-headers.s
    lld/trunk/test/ELF/basic-aarch64.s
    lld/trunk/test/ELF/basic-freebsd.s
    lld/trunk/test/ELF/basic-mips.s
    lld/trunk/test/ELF/basic-ppc.s
    lld/trunk/test/ELF/basic-ppc64.s
    lld/trunk/test/ELF/basic-sparcv9.s
    lld/trunk/test/ELF/basic.s
    lld/trunk/test/ELF/basic32.s
    lld/trunk/test/ELF/basic64be.s
    lld/trunk/test/ELF/bss.s
    lld/trunk/test/ELF/bsymbolic-undef.s
    lld/trunk/test/ELF/bsymbolic.s
    lld/trunk/test/ELF/build-id.s
    lld/trunk/test/ELF/cgprofile-bad-clusters.s
    lld/trunk/test/ELF/cgprofile-icf.s
    lld/trunk/test/ELF/cgprofile-reproduce.s
    lld/trunk/test/ELF/cgprofile-txt.s
    lld/trunk/test/ELF/cgprofile-txt2.s
    lld/trunk/test/ELF/comdat.s
    lld/trunk/test/ELF/common-gc.s
    lld/trunk/test/ELF/common.s
    lld/trunk/test/ELF/compress-debug-sections.s
    lld/trunk/test/ELF/compressed-debug-conflict.s
    lld/trunk/test/ELF/compressed-debug-input.s
    lld/trunk/test/ELF/compressed-input-alignment.test
    lld/trunk/test/ELF/copy-rel-pie.s
    lld/trunk/test/ELF/copy-rel-version.s
    lld/trunk/test/ELF/copy-relocation-zero-abs-addr.s
    lld/trunk/test/ELF/debug-gnu-pubnames.s
    lld/trunk/test/ELF/defsym-reserved-syms.s
    lld/trunk/test/ELF/defsym.s
    lld/trunk/test/ELF/discard-locals.s
    lld/trunk/test/ELF/discard-merge-locals.s
    lld/trunk/test/ELF/discard-merge-unnamed.s
    lld/trunk/test/ELF/discard-none.s
    lld/trunk/test/ELF/dso-undef-size.s
    lld/trunk/test/ELF/dso_handle.s
    lld/trunk/test/ELF/dt_flags.s
    lld/trunk/test/ELF/dt_tags.s
    lld/trunk/test/ELF/dynamic-got-rela.s
    lld/trunk/test/ELF/dynamic-got.s
    lld/trunk/test/ELF/dynamic-list-preempt.s
    lld/trunk/test/ELF/dynamic-list-wildcard.s
    lld/trunk/test/ELF/dynamic-list.s
    lld/trunk/test/ELF/dynamic-no-rosegment.s
    lld/trunk/test/ELF/dynamic-reloc.s
    lld/trunk/test/ELF/dynamic.s
    lld/trunk/test/ELF/dynsym-no-rosegment.s
    lld/trunk/test/ELF/dynsym-pie.s
    lld/trunk/test/ELF/eh-align-cie.s
    lld/trunk/test/ELF/eh-frame-begin-end.s
    lld/trunk/test/ELF/eh-frame-gc.s
    lld/trunk/test/ELF/eh-frame-gc2.s
    lld/trunk/test/ELF/eh-frame-hdr-icf-fde.s
    lld/trunk/test/ELF/eh-frame-hdr-no-out2.s
    lld/trunk/test/ELF/eh-frame-hdr.s
    lld/trunk/test/ELF/eh-frame-marker.s
    lld/trunk/test/ELF/eh-frame-merge.s
    lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata2.s
    lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata4.s
    lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata8.s
    lld/trunk/test/ELF/eh-frame-padding-no-rosegment.s
    lld/trunk/test/ELF/eh-frame-type.test
    lld/trunk/test/ELF/eh-frame-value-format7.s
    lld/trunk/test/ELF/eh-frame-value-format8.s
    lld/trunk/test/ELF/ehdr_start.s
    lld/trunk/test/ELF/ehframe-relocation.s
    lld/trunk/test/ELF/elf-header.s
    lld/trunk/test/ELF/emit-relocs-mergeable-i386.s
    lld/trunk/test/ELF/emit-relocs-mergeable.s
    lld/trunk/test/ELF/emit-relocs.s
    lld/trunk/test/ELF/empty-pack-dyn-relocs.s
    lld/trunk/test/ELF/empty-ver.s
    lld/trunk/test/ELF/empty-ver2.s
    lld/trunk/test/ELF/emulation-aarch64.s
    lld/trunk/test/ELF/emulation-arm.s
    lld/trunk/test/ELF/emulation-mips.s
    lld/trunk/test/ELF/emulation-ppc.s
    lld/trunk/test/ELF/emulation-x86.s
    lld/trunk/test/ELF/end-update.s
    lld/trunk/test/ELF/end.s
    lld/trunk/test/ELF/entry.s
    lld/trunk/test/ELF/exclude-libs.s
    lld/trunk/test/ELF/fill-trap-ppc.s
    lld/trunk/test/ELF/fill-trap.s
    lld/trunk/test/ELF/format-binary-non-ascii.s
    lld/trunk/test/ELF/gc-debuginfo-tls.s
    lld/trunk/test/ELF/gc-merge-local-sym.s
    lld/trunk/test/ELF/gc-sections-alloc.s
    lld/trunk/test/ELF/gc-sections-eh.s
    lld/trunk/test/ELF/gc-sections-implicit-addend.s
    lld/trunk/test/ELF/gc-sections-local-sym.s
    lld/trunk/test/ELF/gc-sections-lsda.s
    lld/trunk/test/ELF/gc-sections-merge-addend.s
    lld/trunk/test/ELF/gc-sections-merge-implicit-addend.s
    lld/trunk/test/ELF/gc-sections-merge.s
    lld/trunk/test/ELF/gc-sections-non-alloc-to-merge.s
    lld/trunk/test/ELF/gc-sections-protected.s
    lld/trunk/test/ELF/gc-sections-synthetic.s
    lld/trunk/test/ELF/gc-sections-undefined.s
    lld/trunk/test/ELF/gc-sections-weak.s
    lld/trunk/test/ELF/gc-sections.s
    lld/trunk/test/ELF/gdb-index.s
    lld/trunk/test/ELF/global-offset-table-position-aarch64.s
    lld/trunk/test/ELF/global-offset-table-position-arm.s
    lld/trunk/test/ELF/global-offset-table-position-i386.s
    lld/trunk/test/ELF/global-offset-table-position-mips.s
    lld/trunk/test/ELF/global-offset-table-position.s
    lld/trunk/test/ELF/global_offset_table_shared.s
    lld/trunk/test/ELF/gnu-hash-table-rwsegment.s
    lld/trunk/test/ELF/gnu-hash-table.s
    lld/trunk/test/ELF/gnu-ifunc-canon.s
    lld/trunk/test/ELF/gnu-ifunc-dso.s
    lld/trunk/test/ELF/gnu-ifunc-dyntags.s
    lld/trunk/test/ELF/gnu-ifunc-gotpcrel.s
    lld/trunk/test/ELF/gnu-ifunc-i386.s
    lld/trunk/test/ELF/gnu-ifunc-nosym-i386.s
    lld/trunk/test/ELF/gnu-ifunc-nosym.s
    lld/trunk/test/ELF/gnu-ifunc-plt-i386.s
    lld/trunk/test/ELF/gnu-ifunc-plt.s
    lld/trunk/test/ELF/gnu-ifunc-relative.s
    lld/trunk/test/ELF/gnu-ifunc.s
    lld/trunk/test/ELF/gnu-unique.s
    lld/trunk/test/ELF/gnustack.s
    lld/trunk/test/ELF/got-aarch64.s
    lld/trunk/test/ELF/got-i386.s
    lld/trunk/test/ELF/got-plt-header.s
    lld/trunk/test/ELF/got.s
    lld/trunk/test/ELF/gotpc-relax-nopic.s
    lld/trunk/test/ELF/gotpc-relax-und-dso.s
    lld/trunk/test/ELF/gotpcrelx.s
    lld/trunk/test/ELF/i386-merge.s
    lld/trunk/test/ELF/i386-static-tls-model.s
    lld/trunk/test/ELF/i386-tls-ie-shared.s
    lld/trunk/test/ELF/icf-merged-sections.s
    lld/trunk/test/ELF/image-base.s
    lld/trunk/test/ELF/init-fini-progbits.s
    lld/trunk/test/ELF/init-fini.s
    lld/trunk/test/ELF/linkerscript/absolute-expr.test
    lld/trunk/test/ELF/linkerscript/alternate-sections.s
    lld/trunk/test/ELF/linkerscript/arm-exidx-order.test
    lld/trunk/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s
    lld/trunk/test/ELF/linkerscript/at-addr.s
    lld/trunk/test/ELF/linkerscript/at-self-reference.s
    lld/trunk/test/ELF/linkerscript/at.s
    lld/trunk/test/ELF/linkerscript/at2.test
    lld/trunk/test/ELF/linkerscript/at4.s
    lld/trunk/test/ELF/linkerscript/comdat-gc.s
    lld/trunk/test/ELF/linkerscript/common-assign.s
    lld/trunk/test/ELF/linkerscript/common-exclude.s
    lld/trunk/test/ELF/linkerscript/common-filespec.test
    lld/trunk/test/ELF/linkerscript/common.s
    lld/trunk/test/ELF/linkerscript/compress-debug-sections.s
    lld/trunk/test/ELF/linkerscript/copy-rel-symbol-value.s
    lld/trunk/test/ELF/linkerscript/data-segment-relro.test
    lld/trunk/test/ELF/linkerscript/debuginfo-gc.s
    lld/trunk/test/ELF/linkerscript/defsym.s
    lld/trunk/test/ELF/linkerscript/discard-interp.test
    lld/trunk/test/ELF/linkerscript/dot-is-not-abs.s
    lld/trunk/test/ELF/linkerscript/dynamic-sym.s
    lld/trunk/test/ELF/linkerscript/dynamic.s
    lld/trunk/test/ELF/linkerscript/eh-frame-merge.s
    lld/trunk/test/ELF/linkerscript/ehdr_start.s
    lld/trunk/test/ELF/linkerscript/empty-link-order.test
    lld/trunk/test/ELF/linkerscript/empty-section-size.test
    lld/trunk/test/ELF/linkerscript/empty-synthetic-removed-flags.s
    lld/trunk/test/ELF/linkerscript/entry.s
    lld/trunk/test/ELF/linkerscript/extend-pt-load1.test
    lld/trunk/test/ELF/linkerscript/extend-pt-load2.test
    lld/trunk/test/ELF/linkerscript/extend-pt-load3.test
    lld/trunk/test/ELF/linkerscript/header-addr.test
    lld/trunk/test/ELF/linkerscript/info-section-type.s
    lld/trunk/test/ELF/linkerscript/lazy-symbols.test
    lld/trunk/test/ELF/linkerscript/memory-at.test
    lld/trunk/test/ELF/linkerscript/memory-region-alignment.test
    lld/trunk/test/ELF/linkerscript/merge-sections.s
    lld/trunk/test/ELF/linkerscript/multiple-tbss.s
    lld/trunk/test/ELF/linkerscript/noload.s
    lld/trunk/test/ELF/linkerscript/non-absolute.s
    lld/trunk/test/ELF/linkerscript/obj-symbol-value.s
    lld/trunk/test/ELF/linkerscript/openbsd-bootdata.test
    lld/trunk/test/ELF/linkerscript/openbsd-randomize.s
    lld/trunk/test/ELF/linkerscript/orphan-first-cmd.test
    lld/trunk/test/ELF/linkerscript/outsections-addr.s
    lld/trunk/test/ELF/linkerscript/overlapping-sections.s
    lld/trunk/test/ELF/linkerscript/overlay.test
    lld/trunk/test/ELF/linkerscript/page-size-align.test
    lld/trunk/test/ELF/linkerscript/page-size.s
    lld/trunk/test/ELF/linkerscript/phdr-check.s
    lld/trunk/test/ELF/linkerscript/phdrs-flags.s
    lld/trunk/test/ELF/linkerscript/phdrs.s
    lld/trunk/test/ELF/linkerscript/provide-empty-section.s
    lld/trunk/test/ELF/linkerscript/pt-interp.test
    lld/trunk/test/ELF/linkerscript/relocatable-discard.s
    lld/trunk/test/ELF/linkerscript/repsection-symbol.s
    lld/trunk/test/ELF/linkerscript/section-align.s
    lld/trunk/test/ELF/linkerscript/sections-constraint2.s
    lld/trunk/test/ELF/linkerscript/sections-constraint3.s
    lld/trunk/test/ELF/linkerscript/sections-constraint4.s
    lld/trunk/test/ELF/linkerscript/sections-constraint5.s
    lld/trunk/test/ELF/linkerscript/symbol-alias-relocation.s
    lld/trunk/test/ELF/linkerscript/symbol-only-align.test
    lld/trunk/test/ELF/linkerscript/symbol-only-flags.test
    lld/trunk/test/ELF/linkerscript/tbss.s
    lld/trunk/test/ELF/linkerscript/ttext-script.s
    lld/trunk/test/ELF/linkerscript/version-linker-symbol.s
    lld/trunk/test/ELF/linkerscript/visibility.s
    lld/trunk/test/ELF/local-dynamic.s
    lld/trunk/test/ELF/local-got-pie.s
    lld/trunk/test/ELF/local-got-shared.s
    lld/trunk/test/ELF/local-got.s
    lld/trunk/test/ELF/local-symbols-order.s
    lld/trunk/test/ELF/local-undefined-symbol.s
    lld/trunk/test/ELF/local.s
    lld/trunk/test/ELF/lto/archive-2.ll
    lld/trunk/test/ELF/lto/archive.ll
    lld/trunk/test/ELF/lto/comdat.ll
    lld/trunk/test/ELF/lto/comdat2.ll
    lld/trunk/test/ELF/lto/common.ll
    lld/trunk/test/ELF/lto/common2.ll
    lld/trunk/test/ELF/lto/ctors.ll
    lld/trunk/test/ELF/lto/dynamic-list.ll
    lld/trunk/test/ELF/lto/dynsym.ll
    lld/trunk/test/ELF/lto/linker-script-symbols-assign.ll
    lld/trunk/test/ELF/lto/linker-script-symbols.ll
    lld/trunk/test/ELF/lto/lto-start.ll
    lld/trunk/test/ELF/lto/obj-path.ll
    lld/trunk/test/ELF/lto/parallel-internalize.ll
    lld/trunk/test/ELF/lto/relocatable.ll
    lld/trunk/test/ELF/lto/resolution.ll
    lld/trunk/test/ELF/lto/shlib-undefined.ll
    lld/trunk/test/ELF/lto/tls-preserve.ll
    lld/trunk/test/ELF/lto/undef-mixed.ll
    lld/trunk/test/ELF/lto/undef-weak.ll
    lld/trunk/test/ELF/lto/undef.ll
    lld/trunk/test/ELF/lto/undefined-puts.ll
    lld/trunk/test/ELF/lto/version-script.ll
    lld/trunk/test/ELF/lto/version-script2.ll
    lld/trunk/test/ELF/lto/visibility.ll
    lld/trunk/test/ELF/lto/weak.ll
    lld/trunk/test/ELF/lto/weakodr-visibility.ll
    lld/trunk/test/ELF/lto/wrap-1.ll
    lld/trunk/test/ELF/lto/wrap-2.ll
    lld/trunk/test/ELF/many-alloc-sections.s
    lld/trunk/test/ELF/many-sections.s
    lld/trunk/test/ELF/merge-align.s
    lld/trunk/test/ELF/merge-entsize.s
    lld/trunk/test/ELF/merge-gc-piece.s
    lld/trunk/test/ELF/merge-gc-piece2.s
    lld/trunk/test/ELF/merge-reloc-O0.s
    lld/trunk/test/ELF/merge-reloc.s
    lld/trunk/test/ELF/merge-section-types.s
    lld/trunk/test/ELF/merge-shared-str.s
    lld/trunk/test/ELF/merge-shared.s
    lld/trunk/test/ELF/merge-string-align.s
    lld/trunk/test/ELF/merge-string.s
    lld/trunk/test/ELF/merge-sym.s
    lld/trunk/test/ELF/merge-to-non-alloc.s
    lld/trunk/test/ELF/merge.s
    lld/trunk/test/ELF/mips-26.s
    lld/trunk/test/ELF/mips-32.s
    lld/trunk/test/ELF/mips-64-disp.s
    lld/trunk/test/ELF/mips-64-got-overflow.s
    lld/trunk/test/ELF/mips-64-got.s
    lld/trunk/test/ELF/mips-64.s
    lld/trunk/test/ELF/mips-abs-got.s
    lld/trunk/test/ELF/mips-call-hilo.s
    lld/trunk/test/ELF/mips-call16.s
    lld/trunk/test/ELF/mips-dynamic.s
    lld/trunk/test/ELF/mips-dynsym-sort.s
    lld/trunk/test/ELF/mips-elf-flags.s
    lld/trunk/test/ELF/mips-got-and-copy.s
    lld/trunk/test/ELF/mips-got-extsym.s
    lld/trunk/test/ELF/mips-got-hilo.s
    lld/trunk/test/ELF/mips-got-page-script.s
    lld/trunk/test/ELF/mips-got-page.s
    lld/trunk/test/ELF/mips-got-redundant.s
    lld/trunk/test/ELF/mips-got-relocs.s
    lld/trunk/test/ELF/mips-got-script.s
    lld/trunk/test/ELF/mips-got-string.s
    lld/trunk/test/ELF/mips-got-weak.s
    lld/trunk/test/ELF/mips-got16.s
    lld/trunk/test/ELF/mips-gp-disp.s
    lld/trunk/test/ELF/mips-gp-lowest.s
    lld/trunk/test/ELF/mips-gprel-sec.s
    lld/trunk/test/ELF/mips-gprel32-relocs-gp0.s
    lld/trunk/test/ELF/mips-jalr.test
    lld/trunk/test/ELF/mips-merge-abiflags.s
    lld/trunk/test/ELF/mips-mgot.s
    lld/trunk/test/ELF/mips-micro-got.s
    lld/trunk/test/ELF/mips-micro-jal.s
    lld/trunk/test/ELF/mips-micro-plt.s
    lld/trunk/test/ELF/mips-non-zero-gp0.s
    lld/trunk/test/ELF/mips-options-r.test
    lld/trunk/test/ELF/mips-options.s
    lld/trunk/test/ELF/mips-plt-copy.s
    lld/trunk/test/ELF/mips-reginfo.s
    lld/trunk/test/ELF/mips-sto-pic-flag.s
    lld/trunk/test/ELF/mips-sto-plt.s
    lld/trunk/test/ELF/mips-tls-64.s
    lld/trunk/test/ELF/mips-tls-hilo.s
    lld/trunk/test/ELF/mips-tls.s
    lld/trunk/test/ELF/no-discard-this_module.s
    lld/trunk/test/ELF/noplt-pie.s
    lld/trunk/test/ELF/note-contiguous.s
    lld/trunk/test/ELF/note-loadaddr.s
    lld/trunk/test/ELF/note-multiple.s
    lld/trunk/test/ELF/note-noalloc.s
    lld/trunk/test/ELF/note-noalloc2.s
    lld/trunk/test/ELF/note.s
    lld/trunk/test/ELF/output-section.s
    lld/trunk/test/ELF/pack-dyn-relocs-loop.s
    lld/trunk/test/ELF/pack-dyn-relocs-tls-aarch64.s
    lld/trunk/test/ELF/pack-dyn-relocs-tls-x86-64.s
    lld/trunk/test/ELF/pack-dyn-relocs.s
    lld/trunk/test/ELF/pack-dyn-relocs2.s
    lld/trunk/test/ELF/phdr-align.s
    lld/trunk/test/ELF/pie.s
    lld/trunk/test/ELF/plt-aarch64.s
    lld/trunk/test/ELF/plt-i686.s
    lld/trunk/test/ELF/plt.s
    lld/trunk/test/ELF/ppc64-dynamic-relocations.s
    lld/trunk/test/ELF/ppc64-got-indirect.s
    lld/trunk/test/ELF/ppc64-toc-rel.s
    lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s
    lld/trunk/test/ELF/pr36475.s
    lld/trunk/test/ELF/pre_init_fini_array.s
    lld/trunk/test/ELF/progname.s
    lld/trunk/test/ELF/program-header-layout.s
    lld/trunk/test/ELF/protected-shared.s
    lld/trunk/test/ELF/push-state.s
    lld/trunk/test/ELF/rel-addend-with-rela-input.s
    lld/trunk/test/ELF/relative-dynamic-reloc-pie.s
    lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s
    lld/trunk/test/ELF/relative-dynamic-reloc.s
    lld/trunk/test/ELF/relocatable-bss.s
    lld/trunk/test/ELF/relocatable-comdat-multiple.s
    lld/trunk/test/ELF/relocatable-comdat.s
    lld/trunk/test/ELF/relocatable-comdat2.s
    lld/trunk/test/ELF/relocatable-comment.s
    lld/trunk/test/ELF/relocatable-common.s
    lld/trunk/test/ELF/relocatable-compressed-input.s
    lld/trunk/test/ELF/relocatable-eh-frame-hdr.s
    lld/trunk/test/ELF/relocatable-ehframe.s
    lld/trunk/test/ELF/relocatable-empty-archive.s
    lld/trunk/test/ELF/relocatable-many-sections.s
    lld/trunk/test/ELF/relocatable-rel-iplt.s
    lld/trunk/test/ELF/relocatable-script.s
    lld/trunk/test/ELF/relocatable-section-symbol.s
    lld/trunk/test/ELF/relocatable-symbol-name.s
    lld/trunk/test/ELF/relocatable-symbols.s
    lld/trunk/test/ELF/relocatable-visibility.s
    lld/trunk/test/ELF/relocatable.s
    lld/trunk/test/ELF/relocation-copy-align-common.s
    lld/trunk/test/ELF/relocation-copy-align.s
    lld/trunk/test/ELF/relocation-copy-flags.s
    lld/trunk/test/ELF/relocation-copy-i686.s
    lld/trunk/test/ELF/relocation-copy-relro.s
    lld/trunk/test/ELF/relocation-copy.s
    lld/trunk/test/ELF/relocation-group.test
    lld/trunk/test/ELF/relocation-i686.s
    lld/trunk/test/ELF/relocation-non-alloc.s
    lld/trunk/test/ELF/relocation-relative-synthetic.s
    lld/trunk/test/ELF/relocation-relative-weak.s
    lld/trunk/test/ELF/relocation-shared.s
    lld/trunk/test/ELF/relocation-undefined-weak.s
    lld/trunk/test/ELF/relocation.s
    lld/trunk/test/ELF/relro-tls.s
    lld/trunk/test/ELF/resolution-end.s
    lld/trunk/test/ELF/resolution-shared.s
    lld/trunk/test/ELF/resolution.s
    lld/trunk/test/ELF/rodynamic.s
    lld/trunk/test/ELF/section-layout.s
    lld/trunk/test/ELF/section-symbol.s
    lld/trunk/test/ELF/shared-ppc64.s
    lld/trunk/test/ELF/shared.s
    lld/trunk/test/ELF/shf-info-link.test
    lld/trunk/test/ELF/sht-group-empty.test
    lld/trunk/test/ELF/start-lib-comdat.s
    lld/trunk/test/ELF/startstop-shared.s
    lld/trunk/test/ELF/startstop.s
    lld/trunk/test/ELF/static-with-export-dynamic.s
    lld/trunk/test/ELF/string-gc.s
    lld/trunk/test/ELF/string-table.s
    lld/trunk/test/ELF/strip-debug.s
    lld/trunk/test/ELF/symbol-override.s
    lld/trunk/test/ELF/symbols.s
    lld/trunk/test/ELF/sysv-hash-no-rosegment.s
    lld/trunk/test/ELF/tail-merge-string-align.s
    lld/trunk/test/ELF/tls-align.s
    lld/trunk/test/ELF/tls-dynamic-i686.s
    lld/trunk/test/ELF/tls-dynamic.s
    lld/trunk/test/ELF/tls-got.s
    lld/trunk/test/ELF/tls-initial-exec-local.s
    lld/trunk/test/ELF/tls-offset.s
    lld/trunk/test/ELF/tls-opt-gdie.s
    lld/trunk/test/ELF/tls-opt-iele-i686-nopic.s
    lld/trunk/test/ELF/tls-opt-no-plt.s
    lld/trunk/test/ELF/tls-relocatable.s
    lld/trunk/test/ELF/tls.s
    lld/trunk/test/ELF/ttext-tdata-tbss.s
    lld/trunk/test/ELF/undef-version-script.s
    lld/trunk/test/ELF/undef-with-plt-addr-i686.s
    lld/trunk/test/ELF/undef-with-plt-addr.s
    lld/trunk/test/ELF/verdef-defaultver.s
    lld/trunk/test/ELF/verdef-dependency.s
    lld/trunk/test/ELF/verdef.s
    lld/trunk/test/ELF/verneed.s
    lld/trunk/test/ELF/version-exclude-libs.s
    lld/trunk/test/ELF/version-script-anonymous-local.s
    lld/trunk/test/ELF/version-script-copy-rel.s
    lld/trunk/test/ELF/version-script-extern-exact.s
    lld/trunk/test/ELF/version-script-extern-wildcards-anon.s
    lld/trunk/test/ELF/version-script-extern-wildcards.s
    lld/trunk/test/ELF/version-script-extern.s
    lld/trunk/test/ELF/version-script-glob.s
    lld/trunk/test/ELF/version-script-hide-so-symbol.s
    lld/trunk/test/ELF/version-script-locals.s
    lld/trunk/test/ELF/version-script-weak.s
    lld/trunk/test/ELF/version-script.s
    lld/trunk/test/ELF/version-use.s
    lld/trunk/test/ELF/version-wildcard.test
    lld/trunk/test/ELF/visibility.s
    lld/trunk/test/ELF/weak-undef-export.s
    lld/trunk/test/ELF/weak-undef-hidden.s
    lld/trunk/test/ELF/weak-undef-lib.s
    lld/trunk/test/ELF/weak-undef-no-shared-libs.s
    lld/trunk/test/ELF/weak-undef-shared.s
    lld/trunk/test/ELF/weak-undef-val.s
    lld/trunk/test/ELF/weak-undef.s
    lld/trunk/test/ELF/wrap-dynamic-undef.s
    lld/trunk/test/ELF/wrap-entry.s
    lld/trunk/test/ELF/wrap-plt.s
    lld/trunk/test/ELF/wrap.s
    lld/trunk/test/ELF/x86-64-rela.s
    lld/trunk/test/ELF/x86-64-static-tls-model.s
    lld/trunk/test/ELF/x86-64-tls-gd-local.s
    lld/trunk/test/ELF/x86-64-tls-ld-local.s
    lld/trunk/test/ELF/zstack-size.s
    lld/trunk/test/ELF/ztext.s
    lld/trunk/test/mach-o/arm-interworking.yaml
    lld/trunk/test/mach-o/arm-shims.yaml
    lld/trunk/test/mach-o/exe-offsets.yaml
    lld/trunk/test/mach-o/exe-segment-overlap.yaml
    lld/trunk/test/mach-o/image-base.yaml
    lld/trunk/test/mach-o/sectalign.yaml
    lld/trunk/test/mach-o/subsections-via-symbols-default.yaml
    lld/trunk/test/mach-o/write-final-sections.yaml
    lld/trunk/test/wasm/lto/relocatable.ll
    lld/trunk/test/wasm/lto/weak.ll
    lld/trunk/test/wasm/version.ll

Modified: lld/trunk/test/COFF/arm64-delayimport.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/arm64-delayimport.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/arm64-delayimport.yaml (original)
+++ lld/trunk/test/COFF/arm64-delayimport.yaml Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj %p/Inputs/library-arm64.lib /alternatename:__delayLoadHelper2=main /delayload:library.dll
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix DISASM
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
 
 # DISASM:  140001014:      11 00 00 d0     adrp    x17, #8192
 # DISASM:  140001018:      31 22 00 91     add     x17, x17, #8

Modified: lld/trunk/test/COFF/arm64-import2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/arm64-import2.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/arm64-import2.test (original)
+++ lld/trunk/test/COFF/arm64-import2.test Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
 # RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj %p/Inputs/library-arm64.lib %p/Inputs/library2-arm64.lib
 # RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
 
 # BEFORE: Disassembly of section .text:
 # BEFORE:        0:       00 00 00 94     bl      #0

Modified: lld/trunk/test/COFF/arm64-magic.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/arm64-magic.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/arm64-magic.yaml (original)
+++ lld/trunk/test/COFF/arm64-magic.yaml Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: Format: COFF-ARM64
 # CHECK: Arch: aarch64

Modified: lld/trunk/test/COFF/armnt-entry-point.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/armnt-entry-point.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/armnt-entry-point.test (original)
+++ lld/trunk/test/COFF/armnt-entry-point.test Tue Apr 30 22:49:01 2019
@@ -1,5 +1,5 @@
 # RUN: yaml2obj < %p/Inputs/armnt-executable.obj.yaml > %t.obj
 # RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 CHECK: AddressOfEntryPoint: 0x1001

Modified: lld/trunk/test/COFF/armnt-imports.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/armnt-imports.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/armnt-imports.test (original)
+++ lld/trunk/test/COFF/armnt-imports.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /subsystem:console %t.obj \
 # RUN:   /entry:mainCRTStartup %p/Inputs/library.lib
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s
 
 # CHECK: Import {
 # CHECK:   Name: library.dll

Modified: lld/trunk/test/COFF/associative-comdat-mingw.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/associative-comdat-mingw.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/associative-comdat-mingw.s (original)
+++ lld/trunk/test/COFF/associative-comdat-mingw.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %S/Inputs/associative-comdat-mingw-2.s -filetype=obj -o %t2.obj
 
 # RUN: lld-link -lldmingw -entry:main %t1.obj %t2.obj -out:%t.gc.exe -verbose
-# RUN: llvm-readobj -sections %t.gc.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.gc.exe | FileCheck %s
 
 # CHECK: Sections [
 # CHECK:   Section {

Modified: lld/trunk/test/COFF/associative-comdat.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/associative-comdat.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/associative-comdat.s (original)
+++ lld/trunk/test/COFF/associative-comdat.s Tue Apr 30 22:49:01 2019
@@ -3,10 +3,10 @@
 # RUN: llvm-mc -triple=x86_64-windows-msvc %S/Inputs/associative-comdat-2.s -filetype=obj -o %t2.obj
 
 # RUN: lld-link -entry:main %t1.obj %t2.obj -out:%t.gc.exe
-# RUN: llvm-readobj -sections %t.gc.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.gc.exe | FileCheck %s
 
 # RUN: lld-link -entry:main %t1.obj %t2.obj -opt:noref -out:%t.nogc.exe
-# RUN: llvm-readobj -sections %t.nogc.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.nogc.exe | FileCheck %s
 
 # CHECK: Sections [
 # CHECK:   Section {

Modified: lld/trunk/test/COFF/autoimport-arm-data.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/autoimport-arm-data.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/autoimport-arm-data.s (original)
+++ lld/trunk/test/COFF/autoimport-arm-data.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=armv7-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 
 # IMPORTS: Import {

Modified: lld/trunk/test/COFF/autoimport-arm64-data.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/autoimport-arm64-data.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/autoimport-arm64-data.s (original)
+++ lld/trunk/test/COFF/autoimport-arm64-data.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=aarch64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 
 # IMPORTS: Import {

Modified: lld/trunk/test/COFF/autoimport-gnu-implib.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/autoimport-gnu-implib.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/autoimport-gnu-implib.s (original)
+++ lld/trunk/test/COFF/autoimport-gnu-implib.s Tue Apr 30 22:49:01 2019
@@ -9,7 +9,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-implib.a -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 
 # IMPORTS: Import {
 # IMPORTS-NEXT: Name: foo.dll

Modified: lld/trunk/test/COFF/autoimport-refptr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/autoimport-refptr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/autoimport-refptr.s (original)
+++ lld/trunk/test/COFF/autoimport-refptr.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 

Modified: lld/trunk/test/COFF/autoimport-x86.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/autoimport-x86.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/autoimport-x86.s (original)
+++ lld/trunk/test/COFF/autoimport-x86.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
 
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
 

Modified: lld/trunk/test/COFF/base.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/base.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/base.test (original)
+++ lld/trunk/test/COFF/base.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT-HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT-HEADER %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=DEFAULT-TEXT %s
 
 # DEFAULT-HEADER:    ImageBase: 0x140000000
@@ -9,7 +9,7 @@
 # DEFAULT-TEXT-NEXT: 1000 00000040 01000000
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /base:0x280000000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BASE-HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=BASE-HEADER %s
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=BASE-TEXT %s
 
 # BASE-HEADER: ImageBase: 0x280000000

Modified: lld/trunk/test/COFF/baserel.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/baserel.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/baserel.test (original)
+++ lld/trunk/test/COFF/baserel.test Tue Apr 30 22:49:01 2019
@@ -1,10 +1,10 @@
 # RUN: yaml2obj < %s > %t.obj
 #
 # RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix=BASEREL
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix=BASEREL
 #
 # RUN: lld-link /out:%t.exe /entry:main /fixed %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix=NOBASEREL
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix=NOBASEREL
 #
 # BASEREL:      BaseReloc [
 # BASEREL-NEXT: Entry {
@@ -44,11 +44,11 @@
 # NOBASEREL-NEXT: ]
 #
 # RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -file-headers -sections %t.exe | FileCheck %s \
+# RUN: llvm-readobj --file-headers --sections %t.exe | FileCheck %s \
 # RUN:   --check-prefix=BASEREL-HEADER
 #
 # RUN: lld-link /out:%t.exe /entry:main /fixed %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s \
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s \
 # RUN:   --check-prefix=NOBASEREL-HEADER
 #
 # BASEREL-HEADER-NOT: IMAGE_FILE_RELOCS_STRIPPED

Modified: lld/trunk/test/COFF/combined-resources.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/combined-resources.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/combined-resources.test (original)
+++ lld/trunk/test/COFF/combined-resources.test Tue Apr 30 22:49:01 2019
@@ -8,7 +8,7 @@
 # RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/resource.res \
 # RUN:   %p/Inputs/combined-resources.res %p/Inputs/combined-resources-2.res
 
-# RUN: llvm-readobj -coff-resources -file-headers -section-data %t.exe | \
+# RUN: llvm-readobj --coff-resources --file-headers --section-data %t.exe | \
 # RUN:   FileCheck %s
 
 CHECK:      ResourceTableRVA: 0x2000

Modified: lld/trunk/test/COFF/common-replacement.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/common-replacement.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/common-replacement.s (original)
+++ lld/trunk/test/COFF/common-replacement.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 
 # RUN: lld-link -lldmingw -entry:main %t1.obj %t2.obj -out:%t.exe -verbose 2>&1 \
 # RUN:   | FileCheck -check-prefix VERBOSE %s
-# RUN: llvm-readobj -s %t.exe | FileCheck -check-prefix SECTIONS %s
+# RUN: llvm-readobj -S %t.exe | FileCheck -check-prefix SECTIONS %s
 
 # VERBOSE: -aligncomm:"foo",2
 

Modified: lld/trunk/test/COFF/constant-export.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/constant-export.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/constant-export.test (original)
+++ lld/trunk/test/COFF/constant-export.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: mkdir -p %t
 # RUN: yaml2obj -o %t/constant-export.obj %s
 # RUN: lld-link /machine:x86 /dll /entry:__CFConstantStringClassReference -out:%t/constant-export.dll %t/constant-export.obj
-# RUN: llvm-readobj -coff-exports %t/constant-export.lib | FileCheck %s
+# RUN: llvm-readobj --coff-exports %t/constant-export.lib | FileCheck %s
 
 # CHECK: Type: const
 # CHECK: Name type: noprefix

Modified: lld/trunk/test/COFF/crt-chars.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/crt-chars.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/crt-chars.test (original)
+++ lld/trunk/test/COFF/crt-chars.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s > %t.obj
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s
 
 # CHECK: Name: .CRT
 # CHECK: Characteristics [

Modified: lld/trunk/test/COFF/crt-dyn-initializer-order.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/crt-dyn-initializer-order.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/crt-dyn-initializer-order.test (original)
+++ lld/trunk/test/COFF/crt-dyn-initializer-order.test Tue Apr 30 22:49:01 2019
@@ -33,27 +33,27 @@
 # CHECK-NEXT: SectionData (
 
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t1.obj %t2.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE1
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE1
 # CASE1-NEXT: 01020304 55701011 1205
 
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t2.obj %t1.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE2
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE2
 # CASE2-NEXT: 01020304 10111255 7005
 
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t2.obj %t.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE3
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE3
 # CASE3-NEXT: 01557010 11120203 0405
 
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t.obj %t2.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE4
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE4
 # CASE4-NEXT: 01557002 03041011 1205
 
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t1.obj %t.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE5
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE5
 # CASE5-NEXT: 01101112 55700203 0405
 
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t.obj %t1.obj
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE6
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE6
 # CASE6-NEXT: 01101112 02030455 7005
 
 # CHECK-NEXT: )

Modified: lld/trunk/test/COFF/debug-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/debug-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/debug-reloc.s (original)
+++ lld/trunk/test/COFF/debug-reloc.s Tue Apr 30 22:49:01 2019
@@ -3,10 +3,10 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 
 # RUN: lld-link -lldmingw -debug:dwarf -out:%t.exe -entry:mainfunc -subsystem:console %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s -check-prefix SECTIONS
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix RELOCS
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix HEADERS
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck %s -check-prefix DEBUG
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s -check-prefix SECTIONS
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix RELOCS
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s -check-prefix HEADERS
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck %s -check-prefix DEBUG
 
 # SECTIONS:         Number: 3
 # SECTIONS-NEXT:    Name: .buildid (2E 62 75 69 6C 64 69 64)

Modified: lld/trunk/test/COFF/def-export-stdcall.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/def-export-stdcall.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/def-export-stdcall.s (original)
+++ lld/trunk/test/COFF/def-export-stdcall.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: echo -e "LIBRARY foo\nEXPORTS\n  stdcall\n  fastcall\n  vectorcall\n  _underscored" > %t.def
 # RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix UNDECORATED-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix UNDECORATED-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix UNDECORATED-EXPORTS %s
 
 # UNDECORATED-IMPLIB: Name type: noprefix
 # UNDECORATED-IMPLIB-NEXT: __imp___underscored
@@ -27,7 +27,7 @@
 # RUN: echo -e "LIBRARY foo\nEXPORTS\n  _stdcall at 8\n  @fastcall at 8\n  vectorcall@@8" > %t.def
 # RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
 
 # DECORATED-IMPLIB: Name type: name
 # DECORATED-IMPLIB-NEXT: __imp_ at fastcall@8
@@ -48,7 +48,7 @@
 # RUN: echo -e "LIBRARY foo\nEXPORTS\n  stdcall at 8\n  @fastcall at 8\n  vectorcall@@8" > %t.def
 # RUN: lld-link -lldmingw -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-MINGW-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-MINGW-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-MINGW-EXPORTS %s
 
 # DECORATED-MINGW-IMPLIB: Name type: name
 # DECORATED-MINGW-IMPLIB-NEXT: __imp_ at fastcall@8
@@ -68,11 +68,11 @@
 
 # RUN: lld-link -lldmingw -kill-at -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix MINGW-KILL-AT-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
 
 # RUN: lld-link -lldmingw -kill-at -entry:dllmain -dll %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix MINGW-KILL-AT-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
 
 # MINGW-KILL-AT-IMPLIB: Name type: noprefix
 # MINGW-KILL-AT-IMPLIB: __imp__fastcall

Modified: lld/trunk/test/COFF/delayimports-armnt.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/delayimports-armnt.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/delayimports-armnt.yaml (original)
+++ lld/trunk/test/COFF/delayimports-armnt.yaml Tue Apr 30 22:49:01 2019
@@ -3,8 +3,8 @@
 # RUN: lld-link %t.obj %p/Inputs/library.lib /subsystem:console \
 # RUN:   /entry:mainCRTStartup /alternatename:__delayLoadHelper2=mainCRTStartup \
 # RUN:   /delayload:library.dll /out:%t.exe
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 
 # IMPORT:      Format: COFF-ARM

Modified: lld/trunk/test/COFF/delayimports.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/delayimports.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/delayimports.test (original)
+++ lld/trunk/test/COFF/delayimports.test Tue Apr 30 22:49:01 2019
@@ -1,8 +1,8 @@
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib /delayload:STD64.DLL \
 # RUN:   /alternatename:__delayLoadHelper2=main
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 IMPORT:      DelayImport {
 IMPORT-NEXT:   Name: std64.dll

Modified: lld/trunk/test/COFF/delayimports32.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/delayimports32.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/delayimports32.test (original)
+++ lld/trunk/test/COFF/delayimports32.test Tue Apr 30 22:49:01 2019
@@ -3,8 +3,8 @@
 # RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main at 0 /alternatename:___delayLoadHelper2 at 8=_main at 0 \
 # RUN:   /delayload:std32.dll /out:%t.exe
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
 
 IMPORT:      Format: COFF-i386

Modified: lld/trunk/test/COFF/dll.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/dll.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/dll.test (original)
+++ lld/trunk/test/COFF/dll.test Tue Apr 30 22:49:01 2019
@@ -42,10 +42,10 @@ EXPORT-LTO-NEXT:       3   0x1030  expor
 # RUN:   /export:exportfn1 /export:exportfn2
 # RUN: yaml2obj < %p/Inputs/import.yaml > %t2.obj
 # RUN: lld-link /out:%t2.exe /entry:main %t2.obj %t2.lib
-# RUN: llvm-readobj -coff-imports %t2.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t2.exe | FileCheck -check-prefix=IMPORT %s
 
 # RUN: lld-link /out:%t2.lto.exe /entry:main %t2.obj %t.lto.lib
-# RUN: llvm-readobj -coff-imports %t2.lto.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t2.lto.exe | FileCheck -check-prefix=IMPORT %s
 
 IMPORT: Symbol: exportfn1
 IMPORT: Symbol: exportfn2

Modified: lld/trunk/test/COFF/dllexport.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/dllexport.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/dllexport.s (original)
+++ lld/trunk/test/COFF/dllexport.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: lld-link -entry:dllmain -dll %t.obj -out:%t.dll -implib:%t.lib
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-IMPLIB %s
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
 
 # DECORATED-IMPLIB: Name type: name
 # DECORATED-IMPLIB-NEXT: __imp_ at fastcall@8

Modified: lld/trunk/test/COFF/dllimport-gc.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/dllimport-gc.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/dllimport-gc.test (original)
+++ lld/trunk/test/COFF/dllimport-gc.test Tue Apr 30 22:49:01 2019
@@ -6,11 +6,11 @@
 # RUN: yaml2obj < %s > %t.obj
 
 # RUN: lld-link /out:%t1.exe /entry:main %t.obj %t-oldname.obj %t.lib
-# RUN: llvm-readobj -coff-imports %t1.exe | FileCheck -check-prefix=REF %s
+# RUN: llvm-readobj --coff-imports %t1.exe | FileCheck -check-prefix=REF %s
 # REF-NOT: Symbol: exportfn1
 
 # RUN: lld-link /out:%t2.exe /entry:main %t.obj %t-oldname.obj %t.lib /opt:noref
-# RUN: llvm-readobj -coff-imports %t2.exe | FileCheck -check-prefix=NOREF %s
+# RUN: llvm-readobj --coff-imports %t2.exe | FileCheck -check-prefix=NOREF %s
 # NOREF: Symbol: exportfn1
 
 --- !COFF

Modified: lld/trunk/test/COFF/entry-inference-mingw.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/entry-inference-mingw.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/entry-inference-mingw.s (original)
+++ lld/trunk/test/COFF/entry-inference-mingw.s Tue Apr 30 22:49:01 2019
@@ -5,9 +5,9 @@
 # RUN: lld-link -lldmingw %t.o -out:%t-cui.exe -subsystem:console 2>&1 | FileCheck -allow-empty -check-prefix=LINK %s
 # RUN: lld-link -lldmingw %t.o -out:%t-gui.exe -subsystem:windows 2>&1 | FileCheck -allow-empty -check-prefix=LINK %s
 
-# RUN: llvm-readobj -file-headers %t-default.exe | FileCheck -check-prefix=CUI %s
-# RUN: llvm-readobj -file-headers %t-cui.exe | FileCheck -check-prefix=CUI %s
-# RUN: llvm-readobj -file-headers %t-gui.exe | FileCheck -check-prefix=GUI %s
+# RUN: llvm-readobj --file-headers %t-default.exe | FileCheck -check-prefix=CUI %s
+# RUN: llvm-readobj --file-headers %t-cui.exe | FileCheck -check-prefix=CUI %s
+# RUN: llvm-readobj --file-headers %t-gui.exe | FileCheck -check-prefix=GUI %s
 
 # Check that this doesn't print any warnings.
 # LINK-NOT: found both wmain and main

Modified: lld/trunk/test/COFF/exclude-all.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/exclude-all.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/exclude-all.s (original)
+++ lld/trunk/test/COFF/exclude-all.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
 
 # RUN: lld-link -lldmingw -exclude-all-symbols -dll -out:%t.dll -entry:DllMainCRTStartup at 12 %t.obj
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck %s -check-prefix=NO-EXPORTS
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck %s -check-prefix=NO-EXPORTS
 
 # NO-EXPORTS-NOT: Name:
 
@@ -26,6 +26,6 @@ _dataSym:
 # RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
 #
 # RUN: lld-link -out:%t.dll -dll %t.obj -lldmingw -exclude-all-symbols -output-def:%t.def
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix=DLLEXPORT %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=DLLEXPORT %s
 
 # DLLEXPORT: Name: exportfn3

Modified: lld/trunk/test/COFF/export-all.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/export-all.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/export-all.s (original)
+++ lld/trunk/test/COFF/export-all.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
 
 # RUN: lld-link -lldmingw -dll -out:%t.dll -entry:DllMainCRTStartup at 12 %t.obj -implib:%t.lib
-# RUN: llvm-readobj -coff-exports %t.dll | grep Name: | FileCheck %s
+# RUN: llvm-readobj --coff-exports %t.dll | grep Name: | FileCheck %s
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix=IMPLIB %s
 
 # CHECK: Name:
@@ -43,7 +43,7 @@ __imp__unexported:
 # RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
 #
 # RUN: lld-link -out:%t.dll -dll %t.obj -lldmingw -export-all-symbols -output-def:%t.def
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=CHECK2 %s
 # RUN: cat %t.def | FileCheck -check-prefix=CHECK2-DEF %s
 
 # Note, this will actually export _DllMainCRTStartup as well, since

Modified: lld/trunk/test/COFF/export32.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/export32.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/export32.test (original)
+++ lld/trunk/test/COFF/export32.test Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 #
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 /merge:.edata=.rdata
 # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=CHECK1 %s
-# RUN: llvm-readobj -file-headers -sections %t.dll | FileCheck -check-prefix=HEADER-MERGE %s
+# RUN: llvm-readobj --file-headers --sections %t.dll | FileCheck -check-prefix=HEADER-MERGE %s
 
 # CHECK1:      Export Table:
 # CHECK1:      DLL name: export32.test.tmp.dll

Modified: lld/trunk/test/COFF/fixed.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/fixed.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/fixed.test (original)
+++ lld/trunk/test/COFF/fixed.test Tue Apr 30 22:49:01 2019
@@ -3,20 +3,20 @@
 #
 # RUN: lld-link %t.obj /fixed %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main at 0 /debug /out:%t.fixed.exe
-# RUN: llvm-readobj -file-headers %t.fixed.exe | \
+# RUN: llvm-readobj --file-headers %t.fixed.exe | \
 # RUN:   FileCheck -check-prefix=EXEFIXED %s
 #
 # RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main at 0 /debug /out:%t.exe
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=EXEREL %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=EXEREL %s
 #
 # RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
 #
 # RUN: lld-link %t.obj /dll /fixed /debug /out:%t.fixed.dll
-# RUN: llvm-readobj -file-headers %t.fixed.dll | FileCheck -check-prefix=DLLFIXED %s
+# RUN: llvm-readobj --file-headers %t.fixed.dll | FileCheck -check-prefix=DLLFIXED %s
 #
 # RUN: lld-link %t.obj /dll /debug /out:%t.dll
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=DLLREL %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=DLLREL %s
 
 EXEFIXED-NOT: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE
 DLLFIXED-NOT: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE

Modified: lld/trunk/test/COFF/gfids-corrupt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/gfids-corrupt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/gfids-corrupt.s (original)
+++ lld/trunk/test/COFF/gfids-corrupt.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -opt:noref -guard:nolongjmp -out:%t.exe -entry:main 2>&1 | FileCheck %s --check-prefix=ERRS
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
 
 # ERRS: warning: ignoring .gfids$y symbol table index section in object {{.*}}gfids-corrupt{{.*}}
 # ERRS: warning: ignoring invalid symbol table index in section .gfids$y in object {{.*}}gfids-corrupt{{.*}}

Modified: lld/trunk/test/COFF/gfids-export.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/gfids-export.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/gfids-export.s (original)
+++ lld/trunk/test/COFF/gfids-export.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-pc-win32 %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:cf -dll -out:%t.dll -noentry
-# RUN: llvm-readobj -coff-load-config %t.dll | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-readobj --coff-load-config %t.dll | FileCheck %s --check-prefix=CHECK
 
 # There should be a single entry in the table for the exported symbol.
 #

Modified: lld/trunk/test/COFF/gfids-fallback.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/gfids-fallback.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/gfids-fallback.s (original)
+++ lld/trunk/test/COFF/gfids-fallback.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: grep -B99999 [S]PLITMARKER %s | llvm-mc -triple x86_64-windows-msvc -filetype=obj -o %t1.obj
 # RUN: grep -A99999 [S]PLITMARKER %s | llvm-mc -triple x86_64-windows-msvc -filetype=obj -o %t2.obj
 # RUN: lld-link %t1.obj %t2.obj -guard:nolongjmp -out:%t.exe -entry:main -opt:noref
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
 
 # CHECK: ImageBase: 0x140000000
 # CHECK: LoadConfig [

Modified: lld/trunk/test/COFF/gfids-gc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/gfids-gc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/gfids-gc.s (original)
+++ lld/trunk/test/COFF/gfids-gc.s Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:noref -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:noref -entry:main -debug:dwarf
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:ref -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-GC
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK-GC
 
 # This assembly is meant to mimic what CL emits for this kind of C code when
 # /Gw (-fdata-sections) is enabled:

Modified: lld/trunk/test/COFF/gfids-icf.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/gfids-icf.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/gfids-icf.s (original)
+++ lld/trunk/test/COFF/gfids-icf.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:nolongjmp -out:%t.exe -opt:icf -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
 
 # This assembly is meant to mimic what CL emits for this kind of C code:
 # int icf1() { return 42; }
@@ -37,9 +37,9 @@
 
 # There should be no .gfids section in the output exectuable when we link with
 # -guard:cf or with no -guard:cf/nolongjmp flag.
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
 # RUN: lld-link %t.obj -out:%t.exe -opt:icf -entry:main
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
 
 # NOGFIDSEC: Sections [
 # NOGFIDSEC: Section {

Modified: lld/trunk/test/COFF/gfids-relocations32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/gfids-relocations32.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/gfids-relocations32.s (original)
+++ lld/trunk/test/COFF/gfids-relocations32.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-pc-win32 %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:cf -out:%t.exe -entry:main
-# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
 
 # Only f and _main should go in the table.
 # (use /lldmap:map.txt to check their addresses).

Modified: lld/trunk/test/COFF/gfids-relocations64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/gfids-relocations64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/gfids-relocations64.s (original)
+++ lld/trunk/test/COFF/gfids-relocations64.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-pc-win32 %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:cf -out:%t.exe -entry:main
-# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix=CHECK
 
 # f, g, and main go in the table.
 # Including g isn't strictly necessary since it's not an indirect call target,

Modified: lld/trunk/test/COFF/guard-longjmp.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/guard-longjmp.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/guard-longjmp.s (original)
+++ lld/trunk/test/COFF/guard-longjmp.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -guard:cf -out:%t.exe -entry:main
-# RUN: llvm-readobj -file-headers -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers --coff-load-config %t.exe | FileCheck %s
 
 # CHECK: ImageBase: 0x140000000
 # CHECK: LoadConfig [

Modified: lld/trunk/test/COFF/guardcf-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/guardcf-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/guardcf-align.s (original)
+++ lld/trunk/test/COFF/guardcf-align.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN:     > %T/guardcf-align-foobar.obj
 # RUN: lld-link -out:%T/guardcf-align.exe -entry:main -guard:cf \
 # RUN:     %t.obj %T/guardcf-align-foobar.obj
-# RUN: llvm-readobj -coff-load-config %T/guardcf-align.exe | FileCheck %s
+# RUN: llvm-readobj --coff-load-config %T/guardcf-align.exe | FileCheck %s
 
 # Check that the gfids table contains at least one entry that ends in 0
 # and no entries that end in something other than 0.

Modified: lld/trunk/test/COFF/guardcf-lto.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/guardcf-lto.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/guardcf-lto.ll (original)
+++ lld/trunk/test/COFF/guardcf-lto.ll Tue Apr 30 22:49:01 2019
@@ -9,7 +9,7 @@
 
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: lld-link -entry:main -guard:cf -dll %t.bc %t.lib %t.ldcfg.obj -out:%t.dll
-; RUN: llvm-readobj -coff-load-config %t.dll | FileCheck %s
+; RUN: llvm-readobj --coff-load-config %t.dll | FileCheck %s
 
 ; There must be *two* entries in the table: DLL entry point, and my_handler.
 

Modified: lld/trunk/test/COFF/guardcf-thunk.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/guardcf-thunk.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/guardcf-thunk.s (original)
+++ lld/trunk/test/COFF/guardcf-thunk.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # Make an obj that takes the address of that exported function.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc %s -o %t2.obj
 # RUN: lld-link -entry:main -guard:cf %t2.obj %t.lib -nodefaultlib -out:%t.exe
-# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s
 
 # Check that the gfids table contains *exactly* two entries, one for exportfn1
 # and one for main.

Modified: lld/trunk/test/COFF/header-size.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/header-size.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/header-size.s (original)
+++ lld/trunk/test/COFF/header-size.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-windows %s -o %t.obj
 // RUN: lld-link -entry:main -subsystem:console %t.obj -out:%t.exe
-// RUN: llvm-readobj -sections %t.exe | FileCheck %s
+// RUN: llvm-readobj --sections %t.exe | FileCheck %s
     .globl main
 main:
     ret

Modified: lld/trunk/test/COFF/heap.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/heap.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/heap.test (original)
+++ lld/trunk/test/COFF/heap.test Tue Apr 30 22:49:01 2019
@@ -1,25 +1,25 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
 
 DEFAULT: SizeOfHeapReserve: 1048576
 DEFAULT: SizeOfHeapCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main /heap:0x3000 %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 # RUN: echo "HEAPSIZE 12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: SizeOfHeapReserve: 12288
 CHECK1: SizeOfHeapCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main /heap:0x5000,0x3000 %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 # RUN: echo "HEAPSIZE 20480,12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: SizeOfHeapReserve: 20480
 CHECK2: SizeOfHeapCommit: 12288

Modified: lld/trunk/test/COFF/hello32.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/hello32.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/hello32.test (original)
+++ lld/trunk/test/COFF/hello32.test Tue Apr 30 22:49:01 2019
@@ -1,9 +1,9 @@
 # RUN: yaml2obj < %p/Inputs/hello32.yaml > %t.obj
 # RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main at 0 /out:%t.exe /appcontainer
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=HEADER %s
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=HEADER %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 HEADER:      Format: COFF-i386
 HEADER-NEXT: Arch: i386

Modified: lld/trunk/test/COFF/icf-pdata.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/icf-pdata.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/icf-pdata.s (original)
+++ lld/trunk/test/COFF/icf-pdata.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc %s -triple x86_64-windows-msvc -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll -merge:.xdata=.xdata
-# RUN: llvm-readobj -sections -coff-exports %t.dll | FileCheck %s
+# RUN: llvm-readobj --sections --coff-exports %t.dll | FileCheck %s
 
 # CHECK:         Name: .pdata
 # CHECK-NEXT:    VirtualSize: 0x18

Modified: lld/trunk/test/COFF/icf-xdata.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/icf-xdata.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/icf-xdata.s (original)
+++ lld/trunk/test/COFF/icf-xdata.s Tue Apr 30 22:49:01 2019
@@ -2,9 +2,9 @@
 # RUN: llvm-mc %s -triple x86_64-windows-msvc -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll -merge:.xdata=.xdata 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=WARN
-# RUN: llvm-readobj -sections %t.dll | FileCheck %s --check-prefix=XDATA
+# RUN: llvm-readobj --sections %t.dll | FileCheck %s --check-prefix=XDATA
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll
-# RUN: llvm-readobj -sections %t.dll | FileCheck %s --check-prefix=RDATA
+# RUN: llvm-readobj --sections %t.dll | FileCheck %s --check-prefix=RDATA
 
 # There shouldn't be much xdata, because all three .pdata entries (12 bytes
 # each) should use the same .xdata unwind info.

Modified: lld/trunk/test/COFF/imports-gnu-autoexport.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/imports-gnu-autoexport.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/imports-gnu-autoexport.s (original)
+++ lld/trunk/test/COFF/imports-gnu-autoexport.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: llvm-ar rcs %t-implib.a %t-dabcdh.o %t-dabcds00000.o %t-dabcdt.o
 # RUN: lld-link -lldmingw -dll -out:%t.dll -entry:main -subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib %t-implib.a -include:func
-# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix=EXPORT %s
+# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=EXPORT %s
 
 # Check that only the single normal symbol was exported, none of the symbols
 # from the import library.

Modified: lld/trunk/test/COFF/imports-gnu.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/imports-gnu.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/imports-gnu.test (original)
+++ lld/trunk/test/COFF/imports-gnu.test Tue Apr 30 22:49:01 2019
@@ -9,7 +9,7 @@
 # Not linking with -lldmingw; one can link to GNU import libs even if not targeting MinGW.
 # RUN: lld-link -out:%t.exe -entry:main -subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib %t-implib.a -include:func
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
 
 # Check that import entries from both libraries show up.
 

Modified: lld/trunk/test/COFF/imports-mangle.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/imports-mangle.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/imports-mangle.test (original)
+++ lld/trunk/test/COFF/imports-mangle.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /opt:noref /entry:main \
 # RUN:   %t.obj %p/Inputs/imports-mangle.lib
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s
 
 # CHECK: Import {
 # CHECK:   Symbol: sym4 (0)

Modified: lld/trunk/test/COFF/imports.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/imports.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/imports.test (original)
+++ lld/trunk/test/COFF/imports.test Tue Apr 30 22:49:01 2019
@@ -4,12 +4,12 @@
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=TEXT %s
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib /include:ExitProcess
 # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=TEXT %s
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
 
 TEXT: Disassembly of section .text:
 TEXT-NEXT: .text:
@@ -37,7 +37,7 @@ IMPORT-NEXT: }
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /merge:.rdata=.text \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib /include:ExitProcess
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=MERGE %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=MERGE %s
 
 MERGE:      Import {
 MERGE-NEXT:   Name: std64.dll

Modified: lld/trunk/test/COFF/largeaddressaware.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/largeaddressaware.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/largeaddressaware.test (original)
+++ lld/trunk/test/COFF/largeaddressaware.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %p/Inputs/hello32.yaml > %t.obj
 # RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
 # RUN:   /entry:main at 0 /out:%t.exe /largeaddressaware
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=HEADER %s
 
 HEADER:      Format: COFF-i386
 HEADER-NEXT: Arch: i386

Modified: lld/trunk/test/COFF/loadcfg.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/loadcfg.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/loadcfg.ll (original)
+++ lld/trunk/test/COFF/loadcfg.ll Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as -o %t.obj %s
 ; RUN: lld-link /out:%t.exe %t.obj /entry:main /subsystem:console
-; RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+; RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 ; CHECK: LoadConfigTableRVA: 0x2000
 ; CHECK: LoadConfigTableSize: 0x70

Modified: lld/trunk/test/COFF/loadcfg.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/loadcfg.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/loadcfg.test (original)
+++ lld/trunk/test/COFF/loadcfg.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj /entry:main /subsystem:console
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: LoadConfigTableRVA: 0x2000
 # CHECK: LoadConfigTableSize: 0x70

Modified: lld/trunk/test/COFF/loadcfg32.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/loadcfg32.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/loadcfg32.test (original)
+++ lld/trunk/test/COFF/loadcfg32.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj /entry:main /subsystem:console
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: LoadConfigTableRVA: 0x2000
 # CHECK: LoadConfigTableSize: 0x40

Modified: lld/trunk/test/COFF/locally-imported-arm64.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/locally-imported-arm64.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/locally-imported-arm64.test (original)
+++ lld/trunk/test/COFF/locally-imported-arm64.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
 # RUN: llvm-objdump -s %t.exe | FileCheck %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 # CHECK:      Contents of section .text:
 # CHECK-NEXT: 1000 00200000

Modified: lld/trunk/test/COFF/locally-imported.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/locally-imported.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/locally-imported.test (original)
+++ lld/trunk/test/COFF/locally-imported.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj 2>&1 | FileCheck -check-prefix=WARN %s
 # RUN: llvm-objdump -s %t.exe | FileCheck %s
-# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
+# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
 # WARN: warning: [[INPUT:.+]]: locally defined symbol imported: main (defined in [[INPUT]])
 

Modified: lld/trunk/test/COFF/long-section-name.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/long-section-name.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/long-section-name.test (original)
+++ lld/trunk/test/COFF/long-section-name.test Tue Apr 30 22:49:01 2019
@@ -1,8 +1,8 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 # RUN: lld-link /debug /out:%t2.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t2.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t2.exe | FileCheck %s
 
 # CHECK: Name: .eh_fram (
 # CHECK: Name: .data_long_section_name

Modified: lld/trunk/test/COFF/lto-comdat.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/lto-comdat.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/lto-comdat.ll (original)
+++ lld/trunk/test/COFF/lto-comdat.ll Tue Apr 30 22:49:01 2019
@@ -14,30 +14,30 @@
 ; Check that, when we use an LTO main with LTO objects, we optimize away all
 ; of f1, f2, and comdat.
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat1.lto.obj %T/comdat2.lto.obj
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-11 %s
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat.lto.lib
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-11 %s
 
 ; Check that, when we use a non-LTO main with LTO objects, we pick the comdat
 ; implementation in LTO, elide calls to it from inside LTO, and retain the
 ; call to comdat from main.
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.obj %T/comdat1.lto.obj %T/comdat2.lto.obj
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-01 %s
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.obj %T/comdat.lto.lib
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-01 %s
 
 ; Check that, when we use an LTO main with non-LTO objects, we pick the comdat
 ; implementation in LTO, elide the call to it from inside LTO, and keep the
 ; calls to comdat from the non-LTO objects.
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat1.obj %T/comdat2.obj
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-10 %s
 ; RUN: lld-link /out:%T/comdat-main.exe /entry:main /subsystem:console %T/comdat-main.lto.obj %T/comdat.lib
-; RUN: llvm-readobj -file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/comdat-main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/comdat-main.exe | FileCheck -check-prefix=TEXT-10 %s
 
 ; HEADERS-11: AddressOfEntryPoint: 0x1000

Modified: lld/trunk/test/COFF/lto-icf.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/lto-icf.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/lto-icf.ll (original)
+++ lld/trunk/test/COFF/lto-icf.ll Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: lld-link -opt:icf -dll -noentry %t.bc -out:%t.dll
-; RUN: llvm-readobj -coff-exports %t.dll | FileCheck %s
+; RUN: llvm-readobj --coff-exports %t.dll | FileCheck %s
 
 ; CHECK: Export {
 ; CHECK: Export {

Modified: lld/trunk/test/COFF/lto.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/lto.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/lto.ll (original)
+++ lld/trunk/test/COFF/lto.ll Tue Apr 30 22:49:01 2019
@@ -10,24 +10,24 @@
 ; RUN: llvm-ar cru %T/foo.lib %T/foo.obj
 
 ; RUN: lld-link /out:%T/main.exe /entry:main /include:f2 /subsystem:console %T/main.lto.obj %T/foo.lto.obj
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-11 %s
 ; RUN: lld-link /out:%T/main.exe /entry:main /include:f2 /subsystem:console %T/main.lto.obj %T/foo.lto.lib /verbose 2>&1 | FileCheck -check-prefix=VERBOSE %s
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-11 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-11 %s
 
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.obj %T/foo.lto.obj
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-01 %s
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.obj %T/foo.lto.lib
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-01 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-01 %s
 
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.lto.obj %T/foo.obj
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-10 %s
 ; RUN: lld-link /out:%T/main.exe /entry:main /subsystem:console %T/main.lto.obj %T/foo.lib
-; RUN: llvm-readobj -file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
+; RUN: llvm-readobj --file-headers %T/main.exe | FileCheck -check-prefix=HEADERS-10 %s
 ; RUN: llvm-objdump -d %T/main.exe | FileCheck -check-prefix=TEXT-10 %s
 
 ; VERBOSE: foo.lto.lib({{.*}}foo.lto.obj)

Modified: lld/trunk/test/COFF/machine.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/machine.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/machine.test (original)
+++ lld/trunk/test/COFF/machine.test Tue Apr 30 22:49:01 2019
@@ -1,18 +1,18 @@
 # RUN: yaml2obj %p/Inputs/machine-x64.yaml > %t.obj
 # RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
 # RUN: lld-link /entry:main /subsystem:console /machine:x64 \
 # RUN:   /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=AMD64 %s
 
 AMD64: Machine: IMAGE_FILE_MACHINE_AMD64
 
 # RUN: yaml2obj %p/Inputs/machine-x86.yaml > %t.obj
 # RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=I386 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=I386 %s
 # RUN: lld-link /entry:main /subsystem:console /machine:x86 \
 # RUN:   /out:%t.exe %t.obj /fixed
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=I386 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=I386 %s
 
 I386: Machine: IMAGE_FILE_MACHINE_I386
 

Modified: lld/trunk/test/COFF/manifestinput.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/manifestinput.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/manifestinput.test (original)
+++ lld/trunk/test/COFF/manifestinput.test Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN:   /manifest:embed \
 # RUN:   /manifestuac:"level='requireAdministrator'" \
 # RUN:   /manifestinput:%p/Inputs/manifestinput.test %t.obj
-# RUN: llvm-readobj -coff-resources -file-headers %t.exe | FileCheck %s \
+# RUN: llvm-readobj --coff-resources --file-headers %t.exe | FileCheck %s \
 # RUN:   -check-prefix TEST_EMBED
 
 TEST_EMBED:          ResourceTableRVA: 0x2000

Modified: lld/trunk/test/COFF/merge.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/merge.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/merge.test (original)
+++ lld/trunk/test/COFF/merge.test Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /merge:.foo=.abc /merge:.bar=.def %t.obj /debug
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /merge:.foo=.bar /merge:.bar=.abc %t.obj /debug
-# RUN: llvm-readobj -sections %t.exe | FileCheck --check-prefix=CHECK2 %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck --check-prefix=CHECK2 %s
 
 # RUN: not lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /merge:.rsrc=.foo %t.obj /debug 2>&1 | FileCheck --check-prefix=NO-RSRC %s

Modified: lld/trunk/test/COFF/no-idata.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/no-idata.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/no-idata.s (original)
+++ lld/trunk/test/COFF/no-idata.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
 # RUN: lld-link -out:%t.exe -entry:main -subsystem:console %t.obj
 # RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=DUMP %s
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DIRECTORY %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DIRECTORY %s
 
         .text
         .global main

Modified: lld/trunk/test/COFF/noentry.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/noentry.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/noentry.test (original)
+++ lld/trunk/test/COFF/noentry.test Tue Apr 30 22:49:01 2019
@@ -1,8 +1,8 @@
 # RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
 # RUN: lld-link /out:%t.dll /dll %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=ENTRY %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=ENTRY %s
 # RUN: lld-link /out:%t.dll /dll /noentry %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOENTRY %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=NOENTRY %s
 
 ENTRY:   AddressOfEntryPoint: 0x1000
 NOENTRY: AddressOfEntryPoint: 0x0

Modified: lld/trunk/test/COFF/options.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/options.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/options.test (original)
+++ lld/trunk/test/COFF/options.test Tue Apr 30 22:49:01 2019
@@ -1,73 +1,73 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BIND %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=BIND %s
 # RUN: lld-link /allowbind /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BIND %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=BIND %s
 BIND-NOT: IMAGE_DLL_CHARACTERISTICS_NO_BIND
 
 # RUN: lld-link /allowbind:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOBIND %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOBIND %s
 NOBIND: IMAGE_DLL_CHARACTERISTICS_NO_BIND
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ISO %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ISO %s
 # RUN: lld-link /allowisolation /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ISO %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ISO %s
 ISO-NOT: IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION
 
 # RUN: lld-link /allowisolation:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOISO %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOISO %s
 NOISO: IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ENT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ENT %s
 # RUN: lld-link /out:%t.exe /entry:main /highentropyva %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=ENT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=ENT %s
 ENT: IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA
 
 # RUN: lld-link /out:%t.exe /highentropyva:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOENT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOENT %s
 NOENT-NOT: IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA
 
 # RUN: lld-link /out:%t.exe /entry:main /integritycheck %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=INT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=INT %s
 INT: IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOINT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOINT %s
 # RUN: lld-link /out:%t.exe /integritycheck:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOINT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOINT %s
 NOINT-NOT: IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
 # RUN: lld-link /out:%t.exe /entry:main /nxcompat %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NXCOMPAT %s
 NXCOMPAT: IMAGE_DLL_CHARACTERISTICS_NX_COMPAT
 
 # RUN: lld-link /out:%t.exe /nxcompat:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NONXCOMPAT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NONXCOMPAT %s
 NONXCOMPAT-NOT: IMAGE_DLL_CHARACTERISTICS_NX_COMPAT
 
 # RUN: lld-link /out:%t.exe /entry:main /swaprun:CD %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=SWAPCD %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPCD %s
 # RUN: lld-link /out:%t.exe /entry:main /swaprun:cd,net %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=SWAPCD %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPCD %s
 SWAPCD: IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOSWAPCD %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOSWAPCD %s
 NOSWAPCD-NOT: IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP
 
 # RUN: lld-link /out:%t.exe /entry:main /swaprun:NeT %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=SWAPNET %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPNET %s
 # RUN: lld-link /out:%t.exe /entry:main /swaprun:net,cd,cd,net %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=SWAPNET %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=SWAPNET %s
 SWAPNET: IMAGE_FILE_NET_RUN_FROM_SWAP
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOSWAPNET %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOSWAPNET %s
 NOSWAPNET-NOT: IMAGE_FILE_NET_RUN_FROM_SWAP
 
 # RUN: not lld-link /out:%t.exe /entry:main /swaprun: %t.obj 2>&1 | \
@@ -91,15 +91,15 @@ SWAPERR2: /swaprun: invalid argument: fo
 SWAPERR3: /swaprun: invalid argument: cdfoo
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
 # RUN: lld-link /out:%t.exe /entry:main /tsaware %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
 TSAWARE: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE
 
 # RUN: lld-link /tsaware:no /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOTSAWARE %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=NOTSAWARE %s
 # RUN: lld-link /dll /out:%t.dll /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
 # RUN: lld-link /tsaware /dll /out:%t.dll /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
 NOTSAWARE-NOT: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE

Modified: lld/trunk/test/COFF/output-chars.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/output-chars.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/output-chars.test (original)
+++ lld/trunk/test/COFF/output-chars.test Tue Apr 30 22:49:01 2019
@@ -1,12 +1,12 @@
 # RUN: yaml2obj %s > %t.obj
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj
-# RUN: llvm-readobj -sections %t.dll | FileCheck %s
+# RUN: llvm-readobj --sections %t.dll | FileCheck %s
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj /section:.foo,rwe
-# RUN: llvm-readobj -sections %t.dll | FileCheck --check-prefix=SECTION %s
+# RUN: llvm-readobj --sections %t.dll | FileCheck --check-prefix=SECTION %s
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj /merge:.foo=.bar
-# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck --check-prefix=MERGE %s
+# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck --check-prefix=MERGE %s
 # RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj /merge:.foo=.bar /section:.foo,rwe
-# RUN: llvm-readobj -sections %t.dll | FileCheck --check-prefix=MERGE-SECTION %s
+# RUN: llvm-readobj --sections %t.dll | FileCheck --check-prefix=MERGE-SECTION %s
 
 # CHECK: Name: .foo
 # CHECK: Characteristics [

Modified: lld/trunk/test/COFF/pdb-exe-path-dots.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdb-exe-path-dots.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdb-exe-path-dots.test (original)
+++ lld/trunk/test/COFF/pdb-exe-path-dots.test Tue Apr 30 22:49:01 2019
@@ -5,6 +5,6 @@ RUN: mkdir %t
 RUN: mkdir %t/foo
 RUN: lld-link /debug /pdb:%t/foo/./out.pdb /out:%t/out.exe /entry:main /nodefaultlib \
 RUN:   %t1.obj %t2.obj
-RUN: llvm-readobj -coff-debug-directory %t/out.exe | FileCheck %s
+RUN: llvm-readobj --coff-debug-directory %t/out.exe | FileCheck %s
 
 CHECK: PDBFileName: {{.*}}tmp{{/|\\}}foo{{/|\\}}out.pdb
\ No newline at end of file

Modified: lld/trunk/test/COFF/pdbaltpath.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdbaltpath.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdbaltpath.test (original)
+++ lld/trunk/test/COFF/pdbaltpath.test Tue Apr 30 22:49:01 2019
@@ -1,39 +1,39 @@
 # RUN: yaml2obj %p/Inputs/empty.yaml > %t.obj
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:hello.pdb
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix HELLO %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix HELLO %s
 # HELLO:       PDBFileName: hello.pdb
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:%_Pdb%
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix PDBVAR %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix PDBVAR %s
 # PDBVAR:       PDBFileName: pdbaltpath.test.tmp.pdb
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_ExT%.pdb
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix EXTVAR %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix EXTVAR %s
 # EXTVAR:       PDBFileName: fooexe.pdb
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:%_PDB
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE %s
 # NOCLOSE:       PDBFileName: %_PDB
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE2 %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix NOCLOSE2 %s
 # NOCLOSE2:       PDBFileName: foo%_PDB
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB%bar%_EXT
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix CLOSEONE %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix CLOSEONE %s
 # CLOSEONE:       PDBFileName: foopdbaltpath.test.tmp.pdbbar%_EXT
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB%bar%_EXT%
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO %s
 # CLOSETWO:       PDBFileName: foopdbaltpath.test.tmp.pdbbarexe
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%_PDB%bar%_EXT%a
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO2 %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix CLOSETWO2 %s
 # CLOSETWO2:       PDBFileName: foopdbaltpath.test.tmp.pdbbarexea
 
 # RUN: lld-link /entry:main %t.obj /out:%t.exe /debug /pdbaltpath:foo%FoO%bar%r%a 2>&1 | FileCheck --check-prefix UNKNOWN-WARN %s
-# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck --check-prefix ENVVARS %s
+# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck --check-prefix ENVVARS %s
 # UNKNOWN-WARN: only %_PDB% and %_EXT% supported in /pdbaltpath:, keeping %FoO% as literal
 # UNKNOWN-WARN: only %_PDB% and %_EXT% supported in /pdbaltpath:, keeping %r% as literal
 # ENVVARS:       PDBFileName: foo%FoO%bar%r%a

Modified: lld/trunk/test/COFF/resource.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/resource.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/resource.test (original)
+++ lld/trunk/test/COFF/resource.test Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 EXE: {{H.e.l.l.o}}
 
 # Verify the resource tree layout in the final executable.
-# RUN: llvm-readobj -file-headers -coff-resources -section-data %t.exe | \
+# RUN: llvm-readobj --file-headers --coff-resources --section-data %t.exe | \
 # RUN:   FileCheck --check-prefix=RESOURCE_INFO %s
 
 RESOURCE_INFO:      ResourceTableRVA: 0x2000

Modified: lld/trunk/test/COFF/responsefile.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/responsefile.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/responsefile.test (original)
+++ lld/trunk/test/COFF/responsefile.test Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: echo /out:%t.exe /entry:main %t.obj > %t.rsp
 # RUN: lld-link @%t.rsp /heap:0x3000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 CHECK: SizeOfHeapReserve: 12288
 
 # RUN: not lld-link --rsp-quoting=foobar @%t.rsp 2>&1 | \

Modified: lld/trunk/test/COFF/rsds.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/rsds.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/rsds.test (original)
+++ lld/trunk/test/COFF/rsds.test Tue Apr 30 22:49:01 2019
@@ -2,29 +2,29 @@
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /debug /pdbaltpath:test.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.1.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.1.txt
 # RUN: lld-link /debug /pdbaltpath:test.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.2.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.2.txt
 # RUN: cat %t.1.txt %t.2.txt | FileCheck %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /debug /pdb:%t1.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.3.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.3.txt
 # RUN: lld-link /debug /pdb:%t2.pdb /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll > %t.4.txt
+# RUN: llvm-readobj --coff-debug-directory %t.dll > %t.4.txt
 # RUN: cat %t.3.txt %t.4.txt | FileCheck --check-prefix TWOPDBS %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /Brepro /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll | FileCheck --check-prefix REPRO %s
+# RUN: llvm-readobj --coff-debug-directory %t.dll | FileCheck --check-prefix REPRO %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /Brepro /debug /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll | FileCheck --check-prefix REPRODEBUG %s
+# RUN: llvm-readobj --coff-debug-directory %t.dll | FileCheck --check-prefix REPRODEBUG %s
 
 # RUN: rm -f %t.dll %t.pdb
 # RUN: lld-link /lldmingw /debug:dwarf /dll /out:%t.dll /entry:DllMain %t.obj
-# RUN: llvm-readobj -coff-debug-directory %t.dll | FileCheck --check-prefix MINGW %s
+# RUN: llvm-readobj --coff-debug-directory %t.dll | FileCheck --check-prefix MINGW %s
 
 # CHECK: File: [[FILE:.*]].dll
 # CHECK: DebugDirectory [

Modified: lld/trunk/test/COFF/safeseh-md.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/safeseh-md.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/safeseh-md.s (original)
+++ lld/trunk/test/COFF/safeseh-md.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj %S/Inputs/except_handler3.lib -safeseh -out:%t.exe -opt:noref -entry:main
-# RUN: llvm-readobj -coff-load-config %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s
 
 # CHECK: SEHTable [
 # CHECK-NEXT: 0x

Modified: lld/trunk/test/COFF/safeseh-notable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/safeseh-notable.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/safeseh-notable.s (original)
+++ lld/trunk/test/COFF/safeseh-notable.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -entry:main
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # This object lacks a _load_config_used global, so we set
 # IMAGE_DLL_CHARACTERISTICS_NO_SEH even though there is an exception handler.

Modified: lld/trunk/test/COFF/safeseh.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/safeseh.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/safeseh.s (original)
+++ lld/trunk/test/COFF/safeseh.s Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 # REQUIRES: x86
 # RUN: llvm-mc -triple i686-windows-msvc %s -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -opt:noref -entry:main
-# RUN: llvm-readobj -coff-basereloc -coff-load-config -file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --coff-basereloc --coff-load-config --file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -opt:noref -entry:main -debug:dwarf
-# RUN: llvm-readobj -coff-basereloc -coff-load-config -file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
+# RUN: llvm-readobj --coff-basereloc --coff-load-config --file-headers %t.exe | FileCheck %s --check-prefix=CHECK-NOGC
 # RUN: lld-link %t.obj -safeseh -out:%t.exe -opt:ref -entry:main
-# RUN: llvm-readobj -coff-basereloc -coff-load-config -file-headers %t.exe | FileCheck %s --check-prefix=CHECK-GC
+# RUN: llvm-readobj --coff-basereloc --coff-load-config --file-headers %t.exe | FileCheck %s --check-prefix=CHECK-GC
 
 # __safe_se_handler_table needs to be relocated against ImageBase.
 # check that the relocation is present.

Modified: lld/trunk/test/COFF/section.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/section.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/section.test (original)
+++ lld/trunk/test/COFF/section.test Tue Apr 30 22:49:01 2019
@@ -1,19 +1,19 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,r %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=R %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=R %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,w %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=W %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=W %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,e %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=E %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=E %s
 
 # RUN: lld-link /out:%t.exe /entry:main /subsystem:console /force \
 # RUN:   /section:.foo,s %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=S %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=S %s
 
 # R:      Characteristics [
 # R-NEXT:   IMAGE_SCN_CNT_INITIALIZED_DATA

Modified: lld/trunk/test/COFF/sort-debug.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/sort-debug.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/sort-debug.test (original)
+++ lld/trunk/test/COFF/sort-debug.test Tue Apr 30 22:49:01 2019
@@ -1,12 +1,12 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /debug /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 # RUN: lld-link /debug:dwarf /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck %s
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=NODEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=NODEBUG %s
 # RUN: lld-link /debug:symtab /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=NODEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=NODEBUG %s
 
 # CHECK: Name: .text
 # CHECK: Name: .reloc

Modified: lld/trunk/test/COFF/stack.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/stack.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/stack.test (original)
+++ lld/trunk/test/COFF/stack.test Tue Apr 30 22:49:01 2019
@@ -1,25 +1,25 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
 
 DEFAULT: SizeOfStackReserve: 1048576
 DEFAULT: SizeOfStackCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /stack:0x3000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 # RUN: echo "STACKSIZE 12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: SizeOfStackReserve: 12288
 CHECK1: SizeOfStackCommit: 4096
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /stack:0x5000,0x3000
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 # RUN: echo "STACKSIZE 20480,12288" > %t.def
 # RUN: lld-link /out:%t.exe /entry:main /def:%t.def %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: SizeOfStackReserve: 20480
 CHECK2: SizeOfStackCommit: 12288

Modified: lld/trunk/test/COFF/strtab-size.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/strtab-size.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/strtab-size.s (original)
+++ lld/trunk/test/COFF/strtab-size.s Tue Apr 30 22:49:01 2019
@@ -12,7 +12,7 @@
 # output SymbolCount: 0 (and dumpbin.exe would error out with "invalid file
 # or disk full, cannot seek to 0x1602").
 
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 # CHECK: SymbolCount: 199
 
 .global main

Modified: lld/trunk/test/COFF/subsystem-drectve.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/subsystem-drectve.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/subsystem-drectve.test (original)
+++ lld/trunk/test/COFF/subsystem-drectve.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /dll /noentry /out:%t.dll %t.obj
-# RUN: llvm-readobj -file-headers %t.dll | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.dll | FileCheck %s
 
 # CHECK: MajorOperatingSystemVersion: 42
 # CHECK: MinorOperatingSystemVersion: 43

Modified: lld/trunk/test/COFF/subsystem-inference-mingw.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/subsystem-inference-mingw.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/subsystem-inference-mingw.s (original)
+++ lld/trunk/test/COFF/subsystem-inference-mingw.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.o
 
 # RUN: lld-link -lldmingw %t.o -out:%t.exe
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: AddressOfEntryPoint: 0x1001
 # CHECK: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)

Modified: lld/trunk/test/COFF/subsystem-inference.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/subsystem-inference.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/subsystem-inference.test (original)
+++ lld/trunk/test/COFF/subsystem-inference.test Tue Apr 30 22:49:01 2019
@@ -1,18 +1,18 @@
 # RUN: sed -e s/ENTRYNAME/main/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=MAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s
 
 # RUN: sed s/ENTRYNAME/wmain/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
 
 # RUN: sed s/ENTRYNAME/WinMain/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
 
 # RUN: sed s/ENTRYNAME/wWinMain/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
 
 # MAIN:     Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
 # WMAIN:    Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI

Modified: lld/trunk/test/COFF/subsystem-inference2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/subsystem-inference2.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/subsystem-inference2.test (original)
+++ lld/trunk/test/COFF/subsystem-inference2.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj 2>&1 | FileCheck -check-prefix=WARN %s
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # WARN: warning: found main and WinMain; defaulting to /subsystem:console
 # CHECK:     Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI

Modified: lld/trunk/test/COFF/subsystem-inference32.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/subsystem-inference32.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/subsystem-inference32.test (original)
+++ lld/trunk/test/COFF/subsystem-inference32.test Tue Apr 30 22:49:01 2019
@@ -1,18 +1,18 @@
 # RUN: sed -e s/ENTRYNAME/_main/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=MAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s
 
 # RUN: sed s/ENTRYNAME/_wmain/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
 
 # RUN: sed s/ENTRYNAME/_WinMain at 16/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
 
 # RUN: sed s/ENTRYNAME/_wWinMain at 16/ %s | yaml2obj > %t.obj
 # RUN: lld-link /out:%t.exe %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
 
 # MAIN:     Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
 # WMAIN:    Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI

Modified: lld/trunk/test/COFF/subsystem.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/subsystem.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/subsystem.test (original)
+++ lld/trunk/test/COFF/subsystem.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: lld-link /entry:main /out:%t.exe /subsystem:windows \
 # RUN:   %p/Inputs/ret42.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: MajorOperatingSystemVersion: 6
 CHECK1: MinorOperatingSystemVersion: 0
@@ -10,7 +10,7 @@ CHECK1: Subsystem: IMAGE_SUBSYSTEM_WINDO
 
 # RUN: lld-link /entry:main /out:%t.exe /subsystem:windows,8.9 \
 # RUN:   %p/Inputs/ret42.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: MajorOperatingSystemVersion: 8
 CHECK2: MinorOperatingSystemVersion: 9

Modified: lld/trunk/test/COFF/symtab-gc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/symtab-gc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/symtab-gc.s (original)
+++ lld/trunk/test/COFF/symtab-gc.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: lld-link -dll -entry:f -out:%t.dll -implib:%t.lib %tobject.obj
 # RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc -o %tmain.obj %s
 # RUN: lld-link -entry:main -out:%t.exe -opt:ref -debug:dwarf %tmain.obj %t.lib
-# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s
+# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s
 
 # CHECK-NOT: Symbol: f
 

Modified: lld/trunk/test/COFF/symtab.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/symtab.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/symtab.test (original)
+++ lld/trunk/test/COFF/symtab.test Tue Apr 30 22:49:01 2019
@@ -1,13 +1,13 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /debug:dwarf /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck %s
 # RUN: lld-link /debug:dwarf /opt:noref /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck %s
 # RUN: lld-link /debug:symtab /opt:noref /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck %s
 
 # RUN: lld-link /debug /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
-# RUN: llvm-readobj -symbols %t.exe | FileCheck -check-prefix=NO %s
+# RUN: llvm-readobj --symbols %t.exe | FileCheck -check-prefix=NO %s
 
 # CHECK:      Symbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/COFF/timestamp.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/timestamp.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/timestamp.test (original)
+++ lld/trunk/test/COFF/timestamp.test Tue Apr 30 22:49:01 2019
@@ -3,9 +3,9 @@ RUN: yaml2obj %p/Inputs/generic.yaml > %
 RUN: lld-link %t.obj /debug /Brepro /entry:main /nodefaultlib /out:%t.1.exe
 RUN: lld-link %t.obj /debug /Brepro /entry:main /nodefaultlib /out:%t.2.exe
 RUN: lld-link %t.obj /debug /timestamp:0 /entry:main /nodefaultlib /out:%t.3.exe
-RUN: llvm-readobj -file-headers -coff-debug-directory %t.1.exe | FileCheck %s --check-prefix=HASH
-RUN: llvm-readobj -file-headers -coff-debug-directory %t.2.exe | FileCheck %s --check-prefix=HASH
-RUN: llvm-readobj -file-headers -coff-debug-directory %t.3.exe | FileCheck %s --check-prefix=ZERO
+RUN: llvm-readobj --file-headers --coff-debug-directory %t.1.exe | FileCheck %s --check-prefix=HASH
+RUN: llvm-readobj --file-headers --coff-debug-directory %t.2.exe | FileCheck %s --check-prefix=HASH
+RUN: llvm-readobj --file-headers --coff-debug-directory %t.3.exe | FileCheck %s --check-prefix=ZERO
 
 HASH: ImageFileHeader {
 HASH: TimeDateStamp: [[STAMP:.*]]

Modified: lld/trunk/test/COFF/tls.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/tls.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/tls.test (original)
+++ lld/trunk/test/COFF/tls.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: TLSTableRVA: 0x1000
 # CHECK: TLSTableSize: 0x28

Modified: lld/trunk/test/COFF/tls32.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/tls32.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/tls32.test (original)
+++ lld/trunk/test/COFF/tls32.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj < %s > %t.obj
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 # CHECK: TLSTableRVA: 0x1000
 # CHECK: TLSTableSize: 0x18

Modified: lld/trunk/test/COFF/unwind.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/unwind.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/unwind.test (original)
+++ lld/trunk/test/COFF/unwind.test Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 # RUN: yaml2obj < %s > %t.obj
 #
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=HEADER %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=HEADER %s
 # RUN: llvm-objdump -unwind-info %t.exe | FileCheck -check-prefix=UNWIND %s
 #
 # RUN: lld-link /merge:.pdata=.rdata /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers -sections %t.exe | FileCheck -check-prefix=HEADER-MERGE %s
+# RUN: llvm-readobj --file-headers --sections %t.exe | FileCheck -check-prefix=HEADER-MERGE %s
 #
 # HEADER: ExceptionTableRVA: 0x3000
 #

Modified: lld/trunk/test/COFF/version.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/version.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/COFF/version.test (original)
+++ lld/trunk/test/COFF/version.test Tue Apr 30 22:49:01 2019
@@ -1,19 +1,19 @@
 # RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
 
 DEFAULT: MajorImageVersion: 0
 DEFAULT: MinorImageVersion: 0
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /version:11
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
 
 CHECK1: MajorImageVersion: 11
 CHECK1: MinorImageVersion: 0
 
 # RUN: lld-link /out:%t.exe /entry:main %t.obj /version:11.22
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 CHECK2: MajorImageVersion: 11
 CHECK2: MinorImageVersion: 22

Modified: lld/trunk/test/ELF/aarch64-abs64-dyn.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-abs64-dyn.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-abs64-dyn.s (original)
+++ lld/trunk/test/ELF/aarch64-abs64-dyn.s Tue Apr 30 22:49:01 2019
@@ -14,7 +14,7 @@ bar:
         .xword bar
 
 // RUN: ld.lld -shared -o %t.so %t.o
-// RUN: llvm-readobj -symbols -dyn-relocations %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-relocations %t.so | FileCheck %s
 
 // CHECK:      Dynamic Relocations {
 // CHECK-NEXT:   {{.*}} R_AARCH64_RELATIVE - [[BAR_ADDR:.*]]

Modified: lld/trunk/test/ELF/aarch64-condb-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-condb-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-condb-reloc.s (original)
+++ lld/trunk/test/ELF/aarch64-condb-reloc.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN: llvm-objdump -d %t | FileCheck %s
 # RUN: ld.lld -shared %t1 %t2 -o %t3
 # RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=DSO %s
-# RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+# RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 
 # 0x11024 - 36 = 0x11000
 # 0x11028 - 24 = 0x11010

Modified: lld/trunk/test/ELF/aarch64-copy.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-copy.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-copy.s (original)
+++ lld/trunk/test/ELF/aarch64-copy.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-pc-freebsd %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -soname fixed-length-string.so -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs -symbols %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs --symbols %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=CODE %s
 // RUN: llvm-objdump -s -section=.rodata %t3 | FileCheck -check-prefix=RODATA %s
 

Modified: lld/trunk/test/ELF/aarch64-copy2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-copy2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-copy2.s (original)
+++ lld/trunk/test/ELF/aarch64-copy2.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc %p/Inputs/aarch64-copy2.s -o %t2.o -filetype=obj -triple=aarch64-pc-linux
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -t %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
 
         .global _start
 _start:

Modified: lld/trunk/test/ELF/aarch64-fpic-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-fpic-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-fpic-got.s (original)
+++ lld/trunk/test/ELF/aarch64-fpic-got.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux %p/Inputs/shared.s -o %t-lib.o
 # RUN: ld.lld -shared %t-lib.o -o %t-lib.so
 # RUN: ld.lld %t-lib.so %t.o -o %t.exe
-# RUN: llvm-readobj -dyn-relocations %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t.exe | FileCheck %s
 
 ## Checks if got access to dynamic objects is done through a got relative
 ## dynamic relocation and not using plt relative (R_AARCH64_JUMP_SLOT).

Modified: lld/trunk/test/ELF/aarch64-gnu-ifunc-nosym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-gnu-ifunc-nosym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-gnu-ifunc-nosym.s (original)
+++ lld/trunk/test/ELF/aarch64-gnu-ifunc-nosym.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rela_iplt_end/__rela_iplt_start
 // appear in symtab if there is no references to them.

Modified: lld/trunk/test/ELF/aarch64-gnu-ifunc-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-gnu-ifunc-plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-gnu-ifunc-plt.s (original)
+++ lld/trunk/test/ELF/aarch64-gnu-ifunc-plt.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are after the JUMP_SLOT in the plt
 // CHECK: Relocations [

Modified: lld/trunk/test/ELF/aarch64-gnu-ifunc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-gnu-ifunc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-gnu-ifunc.s (original)
+++ lld/trunk/test/ELF/aarch64-gnu-ifunc.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
 
 // CHECK:      Sections [
 // CHECK:       Section {

Modified: lld/trunk/test/ELF/aarch64-got-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-got-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-got-reloc.s (original)
+++ lld/trunk/test/ELF/aarch64-got-reloc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s --section-data  %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data  %t | FileCheck %s
 
 // CHECK:      Name: .got
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/aarch64-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-got.s (original)
+++ lld/trunk/test/ELF/aarch64-got.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t.o
 # RUN: ld.lld %t.o -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK-NOT: Name: .got
 

Modified: lld/trunk/test/ELF/aarch64-relro.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-relro.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-relro.s (original)
+++ lld/trunk/test/ELF/aarch64-relro.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      Type: PT_GNU_RELRO
 # CHECK-NEXT: Offset:

Modified: lld/trunk/test/ELF/aarch64-tls-gdie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tls-gdie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-tls-gdie.s (original)
+++ lld/trunk/test/ELF/aarch64-tls-gdie.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc %p/Inputs/aarch64-tls-gdie.s -o %t2.o -filetype=obj -triple=aarch64-pc-linux
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-// RUN: llvm-readobj -s %t | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S %t | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d %t | FileCheck %s
 
         .globl  _start

Modified: lld/trunk/test/ELF/aarch64-tls-gdle.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tls-gdle.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-tls-gdle.s (original)
+++ lld/trunk/test/ELF/aarch64-tls-gdle.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %tmain.o
 # RUN: ld.lld %tmain.o %ttlsie.o -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-readobj -S -r %tout | FileCheck -check-prefix=RELOC %s
 
 #Local-Dynamic to Local-Exec relax creates no
 #RELOC:      Relocations [

Modified: lld/trunk/test/ELF/aarch64-tls-ie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tls-ie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-tls-ie.s (original)
+++ lld/trunk/test/ELF/aarch64-tls-ie.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN: ld.lld -shared %tdso.o -o %tdso.so
 # RUN: ld.lld --hash-style=sysv %tmain.o %tdso.so -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-readobj -S -r %tout | FileCheck -check-prefix=RELOC %s
 
 #RELOC:      Section {
 #RELOC:        Index:

Modified: lld/trunk/test/ELF/aarch64-tls-iele.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tls-iele.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-tls-iele.s (original)
+++ lld/trunk/test/ELF/aarch64-tls-iele.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %tmain.o
 # RUN: ld.lld %tmain.o %ttlsie.o -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-readobj -S -r %tout | FileCheck -check-prefix=RELOC %s
 
 # Initial-Exec to Local-Exec relax creates no dynamic relocations.
 # RELOC:      Relocations [

Modified: lld/trunk/test/ELF/aarch64-tls-le.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tls-le.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-tls-le.s (original)
+++ lld/trunk/test/ELF/aarch64-tls-le.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %tmain.o
 # RUN: ld.lld %tmain.o -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
+# RUN: llvm-readobj -S -r %tout | FileCheck -check-prefix=RELOC %s
 
 #Local-Dynamic to Local-Exec relax creates no
 #RELOC:      Relocations [

Modified: lld/trunk/test/ELF/aarch64-tls-static.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tls-static.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-tls-static.s (original)
+++ lld/trunk/test/ELF/aarch64-tls-static.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc %s -o %t.o -triple aarch64-pc-linux -filetype=obj
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d %t.so | FileCheck %s
 
 foo:

Modified: lld/trunk/test/ELF/aarch64-tstbr14-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tstbr14-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/aarch64-tstbr14-reloc.s (original)
+++ lld/trunk/test/ELF/aarch64-tstbr14-reloc.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN: llvm-objdump -d %t | FileCheck %s
 # RUN: ld.lld -shared %t1 %t2 -o %t3
 # RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=DSO %s
-# RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+# RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 
 # 0x1101c - 28 = 0x20000
 # 0x11020 - 16 = 0x20010

Modified: lld/trunk/test/ELF/abs-hidden.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/abs-hidden.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/abs-hidden.s (original)
+++ lld/trunk/test/ELF/abs-hidden.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/abs-hidden.s -o %t2.o
 // RUN: ld.lld --hash-style=sysv %t.o %t2.o -o %t.so -shared
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
         .quad foo
         .long foo at gotpcrel

Modified: lld/trunk/test/ELF/amdgpu-abi-version.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-abi-version.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-abi-version.s (original)
+++ lld/trunk/test/ELF/amdgpu-abi-version.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: amdgpu
 # RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 -filetype=obj %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
-# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.so | FileCheck %s
 
 # CHECK: OS/ABI: AMDGPU_HSA (0x40)
 # CHECK: ABIVersion: 1

Modified: lld/trunk/test/ELF/amdgpu-elf-flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-elf-flags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-elf-flags.s (original)
+++ lld/trunk/test/ELF/amdgpu-elf-flags.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj %S/Inputs/amdgpu-kernel-0.s -o %t-0.o
 # RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=-code-object-v3 -filetype=obj %S/Inputs/amdgpu-kernel-1.s -o %t-1.o
 # RUN: ld.lld -shared %t-0.o %t-1.o -o %t.so
-# RUN: llvm-readobj -file-headers %t.so | FileCheck %s
+# RUN: llvm-readobj --file-headers %t.so | FileCheck %s
 
 # CHECK: Flags [
 # CHECK:   EF_AMDGPU_MACH_AMDGCN_GFX803 (0x2A)

Modified: lld/trunk/test/ELF/amdgpu-globals.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-globals.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-globals.s (original)
+++ lld/trunk/test/ELF/amdgpu-globals.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: amdgpu
 # RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t
-# RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s
+# RUN: llvm-readobj --sections --symbols -l %t | FileCheck %s
 
 .type glob0, @object
 .data

Modified: lld/trunk/test/ELF/amdgpu-kernels.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-kernels.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-kernels.s (original)
+++ lld/trunk/test/ELF/amdgpu-kernels.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: amdgpu
 # RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t
-# RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s
+# RUN: llvm-readobj --sections --symbols -l %t | FileCheck %s
 
 .hsa_code_object_version 1,0
 .hsa_code_object_isa 7,0,0,"AMD","AMDGPU"

Modified: lld/trunk/test/ELF/arm-abs32-dyn.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-abs32-dyn.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-abs32-dyn.s (original)
+++ lld/trunk/test/ELF/arm-abs32-dyn.s Tue Apr 30 22:49:01 2019
@@ -15,7 +15,7 @@ bar:
  .word bar
 
 // RUN: ld.lld -shared -o %t.so %t.o
-// RUN: llvm-readobj -symbols -dyn-relocations %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-relocations %t.so | FileCheck %s
 
 // CHECK:      Dynamic Relocations {
 // CHECK-NEXT:   0x2004 R_ARM_RELATIVE

Modified: lld/trunk/test/ELF/arm-attributes.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-attributes.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-attributes.s (original)
+++ lld/trunk/test/ELF/arm-attributes.s Tue Apr 30 22:49:01 2019
@@ -3,11 +3,11 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t2.o
 
 // RUN: ld.lld %t1.o %t2.o -o %t
-// RUN: llvm-readobj -arm-attributes %t | FileCheck %s
+// RUN: llvm-readobj --arm-attributes %t | FileCheck %s
 // RUN: ld.lld %t1.o %t2.o -shared -o %t2
-// RUN: llvm-readobj -arm-attributes %t2 | FileCheck %s
+// RUN: llvm-readobj --arm-attributes %t2 | FileCheck %s
 // RUN: ld.lld %t1.o %t2.o -r -o %t3
-// RUN: llvm-readobj -arm-attributes %t3 | FileCheck %s
+// RUN: llvm-readobj --arm-attributes %t3 | FileCheck %s
 
 // Check that we retain only 1 SHT_ARM_ATTRIBUTES section. At present we do not
 // try and merge or use the contents of SHT_ARM_ATTRIBUTES sections. We just

Modified: lld/trunk/test/ELF/arm-copy.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-copy.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-copy.s (original)
+++ lld/trunk/test/ELF/arm-copy.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %p/Inputs/relocation-copy-arm.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -soname fixed-length-string.so -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs -symbols %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs --symbols %t3 | FileCheck %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t3 | FileCheck -check-prefix=CODE %s
 // RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi -section=.rodata %t3 | FileCheck -check-prefix=RODATA %s
 

Modified: lld/trunk/test/ELF/arm-data-prel.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-data-prel.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-data-prel.s (original)
+++ lld/trunk/test/ELF/arm-data-prel.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 // RUN:          .prel.test : { *(.ARM.exidx) } \
 // RUN:          .TEST1 : { *(.TEST1) } } " > %t.script
 // RUN: ld.lld --script %t.script %t.o -o %t
-// RUN: llvm-readobj -s -sd %t | FileCheck --check-prefix=CHECK %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck --check-prefix=CHECK %s
 
 // The R_ARM_PREL31 relocation is used in by the .ARM.exidx exception tables
 // bit31 of the place denotes whether the field is an inline table entry

Modified: lld/trunk/test/ELF/arm-eabi-version.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-eabi-version.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-eabi-version.s (original)
+++ lld/trunk/test/ELF/arm-eabi-version.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -file-headers %tout | FileCheck %s
+// RUN: llvm-readobj --file-headers %tout | FileCheck %s
  .syntax unified
  .text
  .globl _start

Modified: lld/trunk/test/ELF/arm-exidx-discard.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-exidx-discard.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-exidx-discard.s (original)
+++ lld/trunk/test/ELF/arm-exidx-discard.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple arm-gnu-linux-eabi -mcpu cortex-a7 -arm-add-build-attributes %s -o %t.o
 // RUN: echo "ENTRY(__entrypoint) SECTIONS { . = 0x10000; .text : { *(.text .text.*) } /DISCARD/ : { *(.ARM.exidx*) *(.gnu.linkonce.armexidx.*) } }" > %t.script
 // RUN: ld.lld -T %t.script %t.o -o %t.elf 2>&1
-// RUN: llvm-readobj -sections %t.elf | FileCheck %s
+// RUN: llvm-readobj --sections %t.elf | FileCheck %s
 
 .globl  __entrypoint
 __entrypoint:

Modified: lld/trunk/test/ELF/arm-exidx-link.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-exidx-link.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-exidx-link.s (original)
+++ lld/trunk/test/ELF/arm-exidx-link.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 // CHECK:      Name: .ARM.exidx
 // CHECK-NEXT: Type: SHT_ARM_EXIDX

Modified: lld/trunk/test/ELF/arm-exidx-output.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-exidx-output.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-exidx-output.s (original)
+++ lld/trunk/test/ELF/arm-exidx-output.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t
 // RUN: ld.lld %t -o %t2 2>&1
-// RUN: llvm-readobj -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 // Check that only a single .ARM.exidx output section is created when
 // there are input sections of the form .ARM.exidx.<section-name>. The

Modified: lld/trunk/test/ELF/arm-exidx-relocatable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-exidx-relocatable.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-exidx-relocatable.s (original)
+++ lld/trunk/test/ELF/arm-exidx-relocatable.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %S/Inputs/arm-exidx-cantunwind.s -o %tcantunwind
 // Check that relocatable link maintains SHF_LINK_ORDER
 // RUN: ld.lld -r %t %tcantunwind -o %t4 2>&1
-// RUN: llvm-readobj -s %t4 | FileCheck %s
+// RUN: llvm-readobj -S %t4 | FileCheck %s
 
 // Each assembler created .ARM.exidx section has the SHF_LINK_ORDER flag set
 // with the sh_link containing the section index of the executable section

Modified: lld/trunk/test/ELF/arm-exidx-sentinel-norelocatable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-exidx-sentinel-norelocatable.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-exidx-sentinel-norelocatable.s (original)
+++ lld/trunk/test/ELF/arm-exidx-sentinel-norelocatable.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o %t.o
 // RUN: ld.lld -r %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 // Check that when doing a relocatable link we don't add a terminating entry
 // to the .ARM.exidx section
  .syntax unified

Modified: lld/trunk/test/ELF/arm-exidx-synthetic-link.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-exidx-synthetic-link.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-exidx-synthetic-link.s (original)
+++ lld/trunk/test/ELF/arm-exidx-synthetic-link.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj  -arm-add-build-attributes -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 // Test that when all the .ARM.exidx sections are merged into a single
 // synthetic EXIDX_CANTUNWIND entry we can still set the SHF_LINK_ORDER

Modified: lld/trunk/test/ELF/arm-fpic-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-fpic-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-fpic-got.s (original)
+++ lld/trunk/test/ELF/arm-fpic-got.s Tue Apr 30 22:49:01 2019
@@ -1,8 +1,8 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
-// RUN: llvm-readobj -s -symbols %t | FileCheck -check-prefix=SYMBOLS %s
+// RUN: llvm-readobj -S %t | FileCheck %s
+// RUN: llvm-readobj -S --symbols %t | FileCheck -check-prefix=SYMBOLS %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t | FileCheck -check-prefix=CODE %s
 
 // Test the R_ARM_GOT_PREL relocation

Modified: lld/trunk/test/ELF/arm-gnu-ifunc-nosym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-gnu-ifunc-nosym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-gnu-ifunc-nosym.s (original)
+++ lld/trunk/test/ELF/arm-gnu-ifunc-nosym.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rel_iplt_end/__rel_iplt_start
 // appear in symtab if there are no references to them.

Modified: lld/trunk/test/ELF/arm-gnu-ifunc-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-gnu-ifunc-plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-gnu-ifunc-plt.s (original)
+++ lld/trunk/test/ELF/arm-gnu-ifunc-plt.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -triple=armv7a-linux-gnueabihf -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are last in the .got
 // CHECK: Relocations [

Modified: lld/trunk/test/ELF/arm-gnu-ifunc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-gnu-ifunc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-gnu-ifunc.s (original)
+++ lld/trunk/test/ELF/arm-gnu-ifunc.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -triple armv7a-none-linux-gnueabi -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
  .syntax unified
  .text
  .type foo STT_GNU_IFUNC

Modified: lld/trunk/test/ELF/arm-got-relative.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-got-relative.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-got-relative.s (original)
+++ lld/trunk/test/ELF/arm-got-relative.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -position-independent -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -shared -o %t
-// RUN: llvm-readobj -s -symbols -dyn-relocations %t | FileCheck %s
+// RUN: llvm-readobj -S --symbols --dyn-relocations %t | FileCheck %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t | FileCheck -check-prefix=CODE %s
  .syntax unified
  .text

Modified: lld/trunk/test/ELF/arm-gotoff.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-gotoff.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-gotoff.s (original)
+++ lld/trunk/test/ELF/arm-gotoff.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-linux-gnueabi %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s -r -t %t | FileCheck %s
+// RUN: llvm-readobj -S -r --symbols %t | FileCheck %s
 // RUN: llvm-objdump -triple=armv7a-linux-gnueabi -d %t | FileCheck --check-prefix=DISASM %s
 
 // Test the R_ARM_GOTOFF32 relocation

Modified: lld/trunk/test/ELF/arm-plt-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-plt-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-plt-reloc.s (original)
+++ lld/trunk/test/ELF/arm-plt-reloc.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t | FileCheck %s
 // RUN: ld.lld --hash-style=sysv -shared %t1 %t2 -o %t3
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t3 | FileCheck -check-prefix=DSO %s
-// RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 //
 // Test PLT entry generation
  .syntax unified
@@ -111,7 +111,7 @@ _start:
 // RUN:       }" > %t.script
 // RUN: ld.lld --hash-style=sysv --script %t.script -shared %t1 %t2 -o %t4
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t4 | FileCheck --check-prefix=CHECKHIGH %s
-// RUN: llvm-readobj -s -r %t4 | FileCheck --check-prefix=DSORELHIGH %s
+// RUN: llvm-readobj -S -r %t4 | FileCheck --check-prefix=DSORELHIGH %s
 
 // CHECKHIGH: Disassembly of section .text:
 // CHECKHIGH-NEXT: func1:
@@ -176,7 +176,7 @@ _start:
 // RUN:       }" > %t2.script
 // RUN: ld.lld --hash-style=sysv --script %t2.script -shared %t1 %t2 -o %t5
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t5 | FileCheck --check-prefix=CHECKLONG %s
-// RUN: llvm-readobj -s -r %t5 | FileCheck --check-prefix=DSORELLONG %s
+// RUN: llvm-readobj -S -r %t5 | FileCheck --check-prefix=DSORELLONG %s
 
 // CHECKLONG: Disassembly of section .text:
 // CHECKLONG-NEXT: func1:
@@ -242,7 +242,7 @@ _start:
 // RUN:       }" > %t3.script
 // RUN: ld.lld --hash-style=sysv --script %t3.script -shared %t1 %t2 -o %t6
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t6 | FileCheck --check-prefix=CHECKMIX %s
-// RUN: llvm-readobj -s -r %t6 | FileCheck --check-prefix=DSORELMIX %s
+// RUN: llvm-readobj -S -r %t6 | FileCheck --check-prefix=DSORELMIX %s
 
 // CHECKMIX: Disassembly of section .text:
 // CHECKMIX-NEXT: func1:

Modified: lld/trunk/test/ELF/arm-tag-vfp-args.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-tag-vfp-args.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-tag-vfp-args.s (original)
+++ lld/trunk/test/ELF/arm-tag-vfp-args.s Tue Apr 30 22:49:01 2019
@@ -7,15 +7,15 @@
 
 // The default for this file is 0 (Base AAPCS)
 // RUN: ld.lld %t.o -o %tdefault
-// RUN: llvm-readobj -file-headers %tdefault | FileCheck -check-prefix=CHECK-BASE %s
+// RUN: llvm-readobj --file-headers %tdefault | FileCheck -check-prefix=CHECK-BASE %s
 
 // Expect explicit Base AAPCS.
 // RUN: ld.lld %t.o %tbase.o -o %tbase
-// RUN: llvm-readobj -file-headers %tbase | FileCheck -check-prefix=CHECK-BASE %s
+// RUN: llvm-readobj --file-headers %tbase | FileCheck -check-prefix=CHECK-BASE %s
 
 // Expect explicit Base AAPCS when linking Base and Compatible.
 // RUN: ld.lld %t.o %tbase.o %tcompat.o -o %tbasecompat
-// RUN: llvm-readobj -file-headers %tbasecompat | FileCheck -check-prefix=CHECK-BASE %s
+// RUN: llvm-readobj --file-headers %tbasecompat | FileCheck -check-prefix=CHECK-BASE %s
 
 // CHECK-BASE:   Flags [ (0x5000200)
 // CHECK-BASE-NEXT:     0x200
@@ -25,11 +25,11 @@
 
 // Expect Hard float VFP AAPCS
 // RUN: ld.lld %t.o %tvfp.o -o %tvfp
-// RUN: llvm-readobj -file-headers %tvfp | FileCheck -check-prefix=CHECK-VFP %s
+// RUN: llvm-readobj --file-headers %tvfp | FileCheck -check-prefix=CHECK-VFP %s
 
 // Expect Hard float VFP AAPCS when linking VFP and Compatible
 // RUN: ld.lld %t.o %tvfp.o %tcompat.o -o %tvfpcompat
-// RUN: llvm-readobj -file-headers %tvfpcompat | FileCheck -check-prefix=CHECK-VFP %s
+// RUN: llvm-readobj --file-headers %tvfpcompat | FileCheck -check-prefix=CHECK-VFP %s
 
 // CHECK-VFP:   Flags [ (0x5000400)
 // CHECK-VFP-NEXT:     0x400
@@ -39,11 +39,11 @@
 
 // Expect Toolchain specifc to not use either Base or VFP AAPCS
 // RUN: ld.lld %t.o %ttoolchain.o -o %ttoolchain
-// RUN: llvm-readobj -file-headers %ttoolchain | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
+// RUN: llvm-readobj --file-headers %ttoolchain | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
 
 // Expect Toolchain and Compatible to have same affect as Toolchain.
 // RUN: ld.lld %t.o %ttoolchain.o %tcompat.o -o %ttoolchaincompat
-// RUN: llvm-readobj -file-headers %ttoolchaincompat | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
+// RUN: llvm-readobj --file-headers %ttoolchaincompat | FileCheck -check-prefix=CHECK-TOOLCHAIN %s
 
 // CHECK-TOOLCHAIN:   Flags [ (0x5000000)
 // CHECK-TOOLCHAIN-NEXT:     0x1000000

Modified: lld/trunk/test/ELF/arm-thumb-interwork-thunk.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-thumb-interwork-thunk.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-thumb-interwork-thunk.s (original)
+++ lld/trunk/test/ELF/arm-thumb-interwork-thunk.s Tue Apr 30 22:49:01 2019
@@ -19,7 +19,7 @@
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t3 | FileCheck -check-prefix=CHECK-ARM -check-prefix=CHECK-PI-ARM %s
 // RUN: llvm-objdump -d -triple=thumbv7a-none-linux-gnueabi %t4 | FileCheck -check-prefix=CHECK-THUMB -check-prefix=CHECK-PI-PLT-THUMB %s
 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t4 | FileCheck -check-prefix=CHECK-ARM -check-prefix=CHECK-PI-PLT-ARM %s
-// RUN: llvm-readobj -s -r %t4 | FileCheck -check-prefix=CHECK-DSO-REL %s
+// RUN: llvm-readobj -S -r %t4 | FileCheck -check-prefix=CHECK-DSO-REL %s
 
 // Test ARM Thumb Interworking
 // The file is linked and checked 3 times to check the following contexts

Modified: lld/trunk/test/ELF/arm-thumb-plt-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-thumb-plt-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-thumb-plt-reloc.s (original)
+++ lld/trunk/test/ELF/arm-thumb-plt-reloc.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 // RUN: ld.lld --hash-style=sysv -shared %t1 %t2 -o %t3
 // RUN: llvm-objdump -triple=thumbv7a-none-linux-gnueabi -d %t3 | FileCheck -check-prefix=DSOTHUMB %s
 // RUN: llvm-objdump -triple=armv7a-none-linux-gnueabi -d %t3 | FileCheck -check-prefix=DSOARM %s
-// RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck -check-prefix=DSOREL %s
 //
 // Test PLT entry generation
  .syntax unified

Modified: lld/trunk/test/ELF/arm-tls-gd32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-tls-gd32.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-tls-gd32.s (original)
+++ lld/trunk/test/ELF/arm-tls-gd32.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t.so | FileCheck %s
 
 // Test the handling of the global-dynamic TLS model. Dynamic Loader finds

Modified: lld/trunk/test/ELF/arm-tls-ie32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-tls-ie32.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-tls-ie32.s (original)
+++ lld/trunk/test/ELF/arm-tls-ie32.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t.so | FileCheck %s
 
 // Test the handling of the initial-exec TLS model. Relative location within

Modified: lld/trunk/test/ELF/arm-tls-ldm32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-tls-ldm32.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-tls-ldm32.s (original)
+++ lld/trunk/test/ELF/arm-tls-ldm32.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t.so | FileCheck %s
 
 // Test the handling of the local-dynamic TLS model. Dynamic loader finds

Modified: lld/trunk/test/ELF/arm-tls-le32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-tls-le32.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-tls-le32.s (original)
+++ lld/trunk/test/ELF/arm-tls-le32.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s -dyn-relocations %t | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S --dyn-relocations %t | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t | FileCheck %s
 
 // Test the handling of the local exec TLS model. TLS can be resolved

Modified: lld/trunk/test/ELF/arm-tls-norelax-gd-ie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/arm-tls-norelax-gd-ie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/arm-tls-norelax-gd-ie.s (original)
+++ lld/trunk/test/ELF/arm-tls-norelax-gd-ie.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: ld.lld %t1 --shared -o %t1.so
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
 // RUN: ld.lld --hash-style=sysv %t1.so %t.o -o %t
-// RUN: llvm-readobj -s -dyn-relocations %t | FileCheck %s
+// RUN: llvm-readobj -S --dyn-relocations %t | FileCheck %s
 
 // This tls global-dynamic sequence is with respect to a preemptible symbol but
 // is in an application so a relaxation to Initial Exec would normally be

Modified: lld/trunk/test/ELF/as-needed.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/as-needed.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/as-needed.s (original)
+++ lld/trunk/test/ELF/as-needed.s Tue Apr 30 22:49:01 2019
@@ -10,27 +10,27 @@
 /// Check if --as-needed actually works.
 
 // RUN: ld.lld %t.o %t2.so %t3.so %t4.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 // RUN: ld.lld --as-needed %t.o %t2.so %t3.so %t4.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
 // Test with the .o last
 // RUN: ld.lld --as-needed %t2.so %t3.so %t4.so %t.o -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
 // RUN: ld.lld --as-needed %t.o %t2.so --no-as-needed %t3.so %t4.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 /// GROUP command is the same as listing the files on the command line.
 
 // RUN: echo "GROUP(\"%t2.so\" \"%t3.so\" \"%t4.so\")" > %t.script
 // RUN: ld.lld %t.o %t.script -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 // RUN: echo "GROUP(AS_NEEDED(\"%t2.so\" \"%t3.so\" \"%t4.so\"))" > %t.script
 // RUN: ld.lld %t.o %t.script -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck -check-prefix=CHECK2 %s
 
 // CHECK: NEEDED Shared library: [shared1]
 // CHECK: NEEDED Shared library: [shared2]

Modified: lld/trunk/test/ELF/assignment-archive.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/assignment-archive.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/assignment-archive.s (original)
+++ lld/trunk/test/ELF/assignment-archive.s Tue Apr 30 22:49:01 2019
@@ -6,14 +6,14 @@
 
 # RUN: echo "SECTIONS { foo = 1; }" > %t1.script
 # RUN: ld.lld -o %t1.exe --script %t1.script %tar.a %t.o
-# RUN: llvm-readobj -symbols %t1.exe | FileCheck %s
+# RUN: llvm-readobj --symbols %t1.exe | FileCheck %s
 # CHECK-NOT: bar
 # CHECK:     foo
 # CHECK-NOT: bar
 
 # RUN: echo "SECTIONS { zed = foo; }" > %t2.script
 # RUN: ld.lld -o %t2.exe --script %t2.script %tar.a %t.o
-# RUN: llvm-readobj -symbols %t2.exe | FileCheck %s --check-prefix=SYMS
+# RUN: llvm-readobj --symbols %t2.exe | FileCheck %s --check-prefix=SYMS
 # SYMS: bar
 # SYMS: foo
 

Modified: lld/trunk/test/ELF/avoid-empty-program-headers.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/avoid-empty-program-headers.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/avoid-empty-program-headers.s (original)
+++ lld/trunk/test/ELF/avoid-empty-program-headers.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -program-headers %tout | FileCheck %s
+// RUN: llvm-readobj -l %tout | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/basic-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-aarch64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-aarch64.s (original)
+++ lld/trunk/test/ELF/basic-aarch64.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 
 # exits with return code 42 on FreeBSD/AArch64

Modified: lld/trunk/test/ELF/basic-freebsd.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-freebsd.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-freebsd.s (original)
+++ lld/trunk/test/ELF/basic-freebsd.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck %s
 
 .globl _start
 _start:

Modified: lld/trunk/test/ELF/basic-mips.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-mips.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-mips.s (original)
+++ lld/trunk/test/ELF/basic-mips.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: mips
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t.exe \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t.exe \
 # RUN:   | FileCheck %s
 
 # Exits with return code 1 on Linux.

Modified: lld/trunk/test/ELF/basic-ppc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-ppc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-ppc.s (original)
+++ lld/trunk/test/ELF/basic-ppc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: ppc
 # RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t
 # RUN: ld.lld --hash-style=sysv -discard-all -shared %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -section-data -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections --section-data -l %t2 | FileCheck %s
 
 # exits with return code 42 on FreeBSD
 .text

Modified: lld/trunk/test/ELF/basic-ppc64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-ppc64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-ppc64.s (original)
+++ lld/trunk/test/ELF/basic-ppc64.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: ppc
 # # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
 # RUN: ld.lld --hash-style=sysv -discard-all -shared %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -section-data -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections --section-data -l %t2 | FileCheck %s
 .abiversion 2
 # Exits with return code 55 on linux.
 .text

Modified: lld/trunk/test/ELF/basic-sparcv9.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic-sparcv9.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic-sparcv9.s (original)
+++ lld/trunk/test/ELF/basic-sparcv9.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: sparc
 # RUN: llvm-mc -filetype=obj -triple=sparc64-unknown-openbsd %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 
 # exits with return code 42 on OpenBSD/sparc64

Modified: lld/trunk/test/ELF/basic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic.s (original)
+++ lld/trunk/test/ELF/basic.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 # RUN: ld.lld %t -o /dev/null
 
@@ -204,7 +204,7 @@ _start:
 # Test for the response file (POSIX quoting style)
 # RUN: echo " -o %t2" > %t.responsefile
 # RUN: ld.lld %t --rsp-quoting=posix @%t.responsefile
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
+# RUN: llvm-readobj --file-headers --sections -l --symbols %t2 \
 # RUN:   | FileCheck %s
 
 # Test for the response file (Windows quoting style)

Modified: lld/trunk/test/ELF/basic32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic32.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic32.s (original)
+++ lld/trunk/test/ELF/basic32.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l %t2 | FileCheck %s
 
 # exits with return code 42 on linux
 .globl _start

Modified: lld/trunk/test/ELF/basic64be.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/basic64be.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/basic64be.s (original)
+++ lld/trunk/test/ELF/basic64be.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: ppc
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
 # RUN: ld.lld -discard-all %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -section-data -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections --section-data -l %t2 | FileCheck %s
 
 # exits with return code 42 on linux
 .text

Modified: lld/trunk/test/ELF/bss.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/bss.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/bss.s (original)
+++ lld/trunk/test/ELF/bss.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 // Test that bss takes no space on disk.
 

Modified: lld/trunk/test/ELF/bsymbolic-undef.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/bsymbolic-undef.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/bsymbolic-undef.s (original)
+++ lld/trunk/test/ELF/bsymbolic-undef.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared -Bsymbolic %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/bsymbolic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/bsymbolic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/bsymbolic.s (original)
+++ lld/trunk/test/ELF/bsymbolic.s Tue Apr 30 22:49:01 2019
@@ -3,9 +3,9 @@
 // RUN: ld.lld -shared %t.o -o %t0.so
 // RUN: ld.lld -shared -Bsymbolic %t.o -o %t1.so
 // RUN: ld.lld -shared -Bsymbolic-functions %t.o -o %t2.so
-// RUN: llvm-readobj -s %t0.so | FileCheck -check-prefix=NOOPTION %s
-// RUN: llvm-readobj -s %t1.so | FileCheck -check-prefix=SYMBOLIC %s
-// RUN: llvm-readobj -s %t2.so | FileCheck -check-prefix=SYMBOLIC %s
+// RUN: llvm-readobj -S %t0.so | FileCheck -check-prefix=NOOPTION %s
+// RUN: llvm-readobj -S %t1.so | FileCheck -check-prefix=SYMBOLIC %s
+// RUN: llvm-readobj -S %t2.so | FileCheck -check-prefix=SYMBOLIC %s
 
 // NOOPTION:     Section {
 // NOOPTION:       Name: .plt

Modified: lld/trunk/test/ELF/build-id.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/build-id.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/build-id.s (original)
+++ lld/trunk/test/ELF/build-id.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 # RUN: ld.lld --build-id %t -o %t2
-# RUN: llvm-readobj -s %t2 | FileCheck -check-prefix=ALIGN %s
+# RUN: llvm-readobj -S %t2 | FileCheck -check-prefix=ALIGN %s
 
 # RUN: ld.lld --build-id %t -o %t2 -threads
 # RUN: llvm-objdump -s %t2 | FileCheck -check-prefix=DEFAULT %s

Modified: lld/trunk/test/ELF/cgprofile-bad-clusters.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/cgprofile-bad-clusters.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/cgprofile-bad-clusters.s (original)
+++ lld/trunk/test/ELF/cgprofile-bad-clusters.s Tue Apr 30 22:49:01 2019
@@ -11,7 +11,7 @@
 # RUN: echo "G H 5" >> %t.call_graph
 # RUN: echo "H I 4" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
     .section    .text.A,"ax", at progbits
     .globl A

Modified: lld/trunk/test/ELF/cgprofile-icf.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/cgprofile-icf.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/cgprofile-icf.s (original)
+++ lld/trunk/test/ELF/cgprofile-icf.s Tue Apr 30 22:49:01 2019
@@ -6,9 +6,9 @@
 # RUN: echo "A C 40" >> %t.call_graph
 # RUN: echo "C D 61" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t.out -icf=all
-# RUN: llvm-readobj -symbols %t.out | FileCheck %s
+# RUN: llvm-readobj --symbols %t.out | FileCheck %s
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2.out
-# RUN: llvm-readobj -symbols %t2.out | FileCheck %s --check-prefix=NOICF
+# RUN: llvm-readobj --symbols %t2.out | FileCheck %s --check-prefix=NOICF
 
     .section    .text.D,"ax", at progbits
     .globl  D

Modified: lld/trunk/test/ELF/cgprofile-reproduce.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/cgprofile-reproduce.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/cgprofile-reproduce.s (original)
+++ lld/trunk/test/ELF/cgprofile-reproduce.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: echo "D B 10" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2 --print-symbol-order=%t3
 # RUN: ld.lld -e A %t --symbol-ordering-file %t3 -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 # CHECK:      Name: A
 # CHECK-NEXT: Value: 0x201003

Modified: lld/trunk/test/ELF/cgprofile-txt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/cgprofile-txt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/cgprofile-txt.s (original)
+++ lld/trunk/test/ELF/cgprofile-txt.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld -e A %t -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=NOSORT
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=NOSORT
 
 # RUN: echo "A B 10" > %t.call_graph
 # RUN: echo "A B 10" >> %t.call_graph
@@ -25,7 +25,7 @@
 # RUN: echo "TooManyPreds9 TooManyPreds 10" >> %t.call_graph
 # RUN: echo "TooManyPreds10 TooManyPreds 11" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
     .section    .text.D,"ax", at progbits
 D:

Modified: lld/trunk/test/ELF/cgprofile-txt2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/cgprofile-txt2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/cgprofile-txt2.s (original)
+++ lld/trunk/test/ELF/cgprofile-txt2.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: echo "C D 40" >> %t.call_graph
 # RUN: echo "D B 10" >> %t.call_graph
 # RUN: ld.lld -e A %t --call-graph-ordering-file %t.call_graph -o %t2
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 # CHECK:      Name: A
 # CHECK-NEXT: Value: 0x201003

Modified: lld/trunk/test/ELF/comdat.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/comdat.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/comdat.s (original)
+++ lld/trunk/test/ELF/comdat.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/comdat.s -o %t2.o
 // RUN: ld.lld -shared %t.o %t.o %t2.o -o %t
 // RUN: llvm-objdump -d %t | FileCheck %s
-// RUN: llvm-readobj -s -t %t | FileCheck --check-prefix=READ %s
+// RUN: llvm-readobj -S --symbols %t | FileCheck --check-prefix=READ %s
 
 // Check that we don't crash with --gc-section and that we print a list of
 // reclaimed sections on stderr.

Modified: lld/trunk/test/ELF/common-gc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/common-gc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/common-gc.s (original)
+++ lld/trunk/test/ELF/common-gc.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck %s --check-prefix=NOGC
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck %s --check-prefix=NOGC
 
 # NOGC:      Name: .bss
 # NOGC-NEXT: Type:
@@ -18,7 +18,7 @@
 # NOGC: Name: foo
 
 # RUN: ld.lld -gc-sections %t -o %t1
-# RUN: llvm-readobj -sections -symbols %t1 | FileCheck %s --check-prefix=GC
+# RUN: llvm-readobj --sections --symbols %t1 | FileCheck %s --check-prefix=GC
 
 # GC:      Name: .bss
 # GC-NEXT: Type:

Modified: lld/trunk/test/ELF/common.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/common.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/common.s (original)
+++ lld/trunk/test/ELF/common.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2
 // RUN: ld.lld %t %t2 -o %t3
-// RUN: llvm-readobj -t -s %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t3 | FileCheck %s
 
 // CHECK:      Name: .bss
 // CHECK-NEXT: Type: SHT_NOBITS

Modified: lld/trunk/test/ELF/compress-debug-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/compress-debug-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/compress-debug-sections.s (original)
+++ lld/trunk/test/ELF/compress-debug-sections.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # ZLIBCONTENT:     Contents of section .debug_str:
 # ZLIBCONTENT-NOT: AAAAAAAAA
 
-# RUN: llvm-readobj -s %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
 # ZLIBFLAGS:       Section {
 # ZLIBFLAGS:         Index:
 # ZLIBFLAGS:         Name: .debug_str
@@ -24,7 +24,7 @@
 ## Test alias.
 # RUN: ld.lld %t.o -o %t2 --compress-debug-sections zlib
 # RUN: llvm-objdump -s %t2 | FileCheck %s --check-prefix=ZLIBCONTENT
-# RUN: llvm-readobj -s %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
 
 # RUN: not ld.lld %t.o -o %t1 --compress-debug-sections=zlib-gabi 2>&1 | \
 # RUN:   FileCheck -check-prefix=ERR %s

Modified: lld/trunk/test/ELF/compressed-debug-conflict.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/compressed-debug-conflict.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/compressed-debug-conflict.s (original)
+++ lld/trunk/test/ELF/compressed-debug-conflict.s Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # REQUIRES: x86, zlib
 # RUN: llvm-mc -filetype=obj -triple i686-linux-gnu -compress-debug-sections=zlib %s -o %t.o
-# RUN: llvm-readobj -sections %t.o | FileCheck -check-prefix=OBJ %s
+# RUN: llvm-readobj --sections %t.o | FileCheck -check-prefix=OBJ %s
 # RUN: not ld.lld %t.o %t.o -o /dev/null 2>&1 | FileCheck -check-prefix=ERROR %s
 
 # OBJ:      Sections [

Modified: lld/trunk/test/ELF/compressed-debug-input.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/compressed-debug-input.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/compressed-debug-input.s (original)
+++ lld/trunk/test/ELF/compressed-debug-input.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: zlib, x86
 
 # RUN: llvm-mc -compress-debug-sections=zlib -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: llvm-readobj -sections %t | FileCheck -check-prefix=ZLIB %s
+# RUN: llvm-readobj --sections %t | FileCheck -check-prefix=ZLIB %s
 # ZLIB:      Section {
 # ZLIB:        Index: 2
 # ZLIB:        Name: .debug_str
@@ -21,7 +21,7 @@
 # ZLIB-NEXT: }
 
 # RUN: llvm-mc -compress-debug-sections=zlib-gnu -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
-# RUN: llvm-readobj -sections %t2 | FileCheck -check-prefix=GNU %s
+# RUN: llvm-readobj --sections %t2 | FileCheck -check-prefix=GNU %s
 # GNU:      Section {
 # GNU:        Index: 2
 # GNU:        Name: .zdebug_str
@@ -40,10 +40,10 @@
 # GNU-NEXT: }
 
 # RUN: ld.lld --hash-style=sysv %t -o %t.so -shared
-# RUN: llvm-readobj -sections -section-data %t.so | FileCheck -check-prefix=DATA %s
+# RUN: llvm-readobj --sections --section-data %t.so | FileCheck -check-prefix=DATA %s
 
 # RUN: ld.lld --hash-style=sysv %t2 -o %t2.so -shared
-# RUN: llvm-readobj -sections -section-data %t2.so | FileCheck -check-prefix=DATA %s
+# RUN: llvm-readobj --sections --section-data %t2.so | FileCheck -check-prefix=DATA %s
 
 # DATA:      Section {
 # DATA:        Index: 6

Modified: lld/trunk/test/ELF/compressed-input-alignment.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/compressed-input-alignment.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/compressed-input-alignment.test (original)
+++ lld/trunk/test/ELF/compressed-input-alignment.test Tue Apr 30 22:49:01 2019
@@ -2,11 +2,11 @@
 
 # RUN: yaml2obj -docnum=1 %s -o %t.o
 # RUN: ld.lld %t.o %t.o -o %t2
-# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
 
 # RUN: yaml2obj -docnum=2 %s -o %t.o
 # RUN: ld.lld %t.o %t.o -o %t2
-# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
 
 # CHECK:        Name: .debug_info
 # CHECK-NEXT:   Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/copy-rel-pie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/copy-rel-pie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/copy-rel-pie.s (original)
+++ lld/trunk/test/ELF/copy-rel-pie.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc %p/Inputs/copy-rel-pie.s -o %t2.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t.exe -pie
-// RUN: llvm-readobj -s -r %t.exe | FileCheck %s
+// RUN: llvm-readobj -S -r %t.exe | FileCheck %s
 // RUN: llvm-objdump -d %t.exe | FileCheck --check-prefix=DISASM %s
 
 .global _start

Modified: lld/trunk/test/ELF/copy-rel-version.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/copy-rel-version.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/copy-rel-version.s (original)
+++ lld/trunk/test/ELF/copy-rel-version.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 // RUN: echo "v1 {}; v2 {};" > %t.ver
 // RUN: ld.lld %t1.o -shared -soname t1.so --version-script=%t.ver -o %t1.so
 // RUN: ld.lld %t.o %t1.so -o %t
-// RUN: llvm-readobj -t %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/copy-relocation-zero-abs-addr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/copy-relocation-zero-abs-addr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/copy-relocation-zero-abs-addr.s (original)
+++ lld/trunk/test/ELF/copy-relocation-zero-abs-addr.s Tue Apr 30 22:49:01 2019
@@ -3,8 +3,8 @@
 // RUN: ld.lld -shared -o %t2.so %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t3.o
 // RUN: ld.lld %t2.so %t3.o -o %t4
-// RUN: llvm-readobj -symbols %t2.so | FileCheck -check-prefix=ABSADDR %s
-// RUN: llvm-readobj -s -r --expand-relocs %t4 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2.so | FileCheck -check-prefix=ABSADDR %s
+// RUN: llvm-readobj -S -r --expand-relocs %t4 | FileCheck %s
 
 // This tests that symbols with absolute addresses are properly
 // handled. Normal DSO symbols are handled as usual.

Modified: lld/trunk/test/ELF/debug-gnu-pubnames.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/debug-gnu-pubnames.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/debug-gnu-pubnames.s (original)
+++ lld/trunk/test/ELF/debug-gnu-pubnames.s Tue Apr 30 22:49:01 2019
@@ -2,12 +2,12 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 # RUN: ld.lld %t.o -o %t1.exe
-# RUN: llvm-readobj -sections %t1.exe | FileCheck %s
+# RUN: llvm-readobj --sections %t1.exe | FileCheck %s
 # CHECK: .debug_gnu_pubnames
 # CHECK: .debug_gnu_pubtypes
 
 # RUN: ld.lld -gdb-index %t.o -o %t2.exe
-# RUN: llvm-readobj -sections %t2.exe | FileCheck %s --check-prefix=GDB
+# RUN: llvm-readobj --sections %t2.exe | FileCheck %s --check-prefix=GDB
 # GDB-NOT: .debug_gnu_pubnames
 # GDB-NOT: .debug_gnu_pubtypes
 

Modified: lld/trunk/test/ELF/defsym-reserved-syms.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/defsym-reserved-syms.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/defsym-reserved-syms.s (original)
+++ lld/trunk/test/ELF/defsym-reserved-syms.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -o %t %t.o --defsym=foo2=etext
-# RUN: llvm-readobj -t -s %t | FileCheck %s
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s
 
 ## Check 'foo2' value is equal to value of 'etext'.
 # CHECK:     Symbol {
@@ -14,7 +14,7 @@
 ## Check 'foo2' value set correctly when using
 ## reserved symbol 'etext' in expression.
 # RUN: ld.lld -o %t %t.o --defsym=foo2=etext+2
-# RUN: llvm-readobj -t -s %t | FileCheck %s --check-prefix=EXPR
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s --check-prefix=EXPR
 # EXPR:     Symbol {
 # EXPR:      Name: foo2
 # EXPR-NEXT:  Value: 0x201007

Modified: lld/trunk/test/ELF/defsym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/defsym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/defsym.s (original)
+++ lld/trunk/test/ELF/defsym.s Tue Apr 30 22:49:01 2019
@@ -1,12 +1,12 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -o %t %t.o --defsym=foo2=foo1
-# RUN: llvm-readobj -t -s %t | FileCheck %s
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s
 # RUN: llvm-objdump -d -print-imm-hex %t | FileCheck %s --check-prefix=USE
 
 ## Check that we accept --defsym foo2=foo1 form.
 # RUN: ld.lld -o %t2 %t.o --defsym foo2=foo1
-# RUN: llvm-readobj -t -s %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols -S %t2 | FileCheck %s
 # RUN: llvm-objdump -d -print-imm-hex %t2 | FileCheck %s --check-prefix=USE
 
 ## Check we are reporting the error correctly and don't crash
@@ -40,7 +40,7 @@
 # USE-NEXT:    movl $0x123, %edx
 
 # RUN: ld.lld -o %t %t.o --defsym=foo2=1
-# RUN: llvm-readobj -t -s %t | FileCheck %s --check-prefix=ABS
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s --check-prefix=ABS
 
 # ABS:      Symbol {
 # ABS:        Name: foo2
@@ -53,7 +53,7 @@
 # ABS-NEXT: }
 
 # RUN: ld.lld -o %t %t.o --defsym=foo2=foo1+5
-# RUN: llvm-readobj -t -s %t | FileCheck %s --check-prefix=EXPR
+# RUN: llvm-readobj --symbols -S %t | FileCheck %s --check-prefix=EXPR
 
 # EXPR:      Symbol {
 # EXPR:        Name: foo1

Modified: lld/trunk/test/ELF/discard-locals.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/discard-locals.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/discard-locals.s (original)
+++ lld/trunk/test/ELF/discard-locals.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -save-temp-labels %s -o %t
 // RUN: ld.lld -discard-locals %t -o %t2
-// RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t2 | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/discard-merge-locals.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/discard-merge-locals.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/discard-merge-locals.s (original)
+++ lld/trunk/test/ELF/discard-merge-locals.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t2 -shared
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 	leaq	.L.str(%rip), %rdi
 

Modified: lld/trunk/test/ELF/discard-merge-unnamed.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/discard-merge-unnamed.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/discard-merge-unnamed.s (original)
+++ lld/trunk/test/ELF/discard-merge-unnamed.s Tue Apr 30 22:49:01 2019
@@ -1,5 +1,5 @@
 // RUN: ld.lld %p/Inputs/discard-merge-unnamed.o -o %t2 -shared
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // Test that the unnamed symbol is SHF_MERGE is omitted.
 

Modified: lld/trunk/test/ELF/discard-none.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/discard-none.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/discard-none.s (original)
+++ lld/trunk/test/ELF/discard-none.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux -save-temp-labels %s -o %t
 // RUN: ld.lld -discard-none -shared %t -o %t2
-// RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t2 | FileCheck %s
 
 .text
 .Lmyvar:

Modified: lld/trunk/test/ELF/dso-undef-size.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dso-undef-size.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dso-undef-size.s (original)
+++ lld/trunk/test/ELF/dso-undef-size.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: ld.lld -shared %t1.o -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
 # RUN: ld.lld -shared %t2.o %t1.so -o %t2.so
-# RUN: llvm-readobj -symbols -dyn-symbols %t2.so
+# RUN: llvm-readobj --symbols --dyn-syms %t2.so
 
 # CHECK:      Symbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/dso_handle.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dso_handle.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dso_handle.s (original)
+++ lld/trunk/test/ELF/dso_handle.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t
-# RUN: llvm-readobj -symbols %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:    Name: __dso_handle
 # CHECK-NEXT:    Value: 0x0
 # CHECK-NEXT:    Size: 0

Modified: lld/trunk/test/ELF/dt_flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dt_flags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dt_flags.s (original)
+++ lld/trunk/test/ELF/dt_flags.s Tue Apr 30 22:49:01 2019
@@ -5,13 +5,13 @@
 
 # RUN: ld.lld -z global -z initfirst -z interpose -z now -z nodefaultlib \
 # RUN:   -z nodelete -z nodlopen -z origin -Bsymbolic %t %t.so -o %t1
-# RUN: llvm-readobj -dynamic-table %t1 | FileCheck -check-prefix=FLAGS %s
+# RUN: llvm-readobj --dynamic-table %t1 | FileCheck -check-prefix=FLAGS %s
 
 # RUN: ld.lld %t %t.so -o %t2
-# RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 # RUN: ld.lld -z lazy %t %t.so -o %t2
-# RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 # FLAGS: DynamicSection [
 # FLAGS:   0x000000000000001E FLAGS ORIGIN SYMBOLIC BIND_NOW

Modified: lld/trunk/test/ELF/dt_tags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dt_tags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dt_tags.s (original)
+++ lld/trunk/test/ELF/dt_tags.s Tue Apr 30 22:49:01 2019
@@ -3,8 +3,8 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %t
 # RUN: ld.lld -shared %t -o %t.so
 # RUN: ld.lld %t %t.so -o %t.exe
-# RUN: llvm-readobj -dynamic-table %t.so | FileCheck -check-prefix=DSO %s
-# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=EXE %s
+# RUN: llvm-readobj --dynamic-table %t.so | FileCheck -check-prefix=DSO %s
+# RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=EXE %s
 
 # EXE: DynamicSection [
 # EXE:   0x0000000000000015 DEBUG                0x0

Modified: lld/trunk/test/ELF/dynamic-got-rela.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-got-rela.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-got-rela.s (original)
+++ lld/trunk/test/ELF/dynamic-got-rela.s Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared --apply-dynamic-relocs
-// RUN: llvm-readobj -r -s -l -section-data %t.so | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
+// RUN: llvm-readobj -r -S -l --section-data %t.so | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
 // RUN: ld.lld %t.o -o %t2.so -shared
-// RUN: llvm-readobj -r -s -l -section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -r -S -l --section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 // RUN: ld.lld %t.o -o %t2.so -shared --no-apply-dynamic-relocs
-// RUN: llvm-readobj -r -s -l -section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -r -S -l --section-data %t2.so | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 
 // APPLYDYNREL:      Name: .got
 // APPLYDYNREL-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/dynamic-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-got.s (original)
+++ lld/trunk/test/ELF/dynamic-got.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -l -section-data -r %t.so | FileCheck %s
+// RUN: llvm-readobj -S -l --section-data -r %t.so | FileCheck %s
 
 // CHECK:      Name: .got
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/dynamic-list-preempt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-list-preempt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-list-preempt.s (original)
+++ lld/trunk/test/ELF/dynamic-list-preempt.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN: echo "{ global: foo; bar; local: *; };" > %t.vers
 # RUN: ld.lld --hash-style=sysv -fatal-warnings -dynamic-list %t.list -version-script %t.vers -shared %t.o -o %t.so
 # RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=RELOCS %s
-# RUN: llvm-readobj -dyn-symbols  %t.so | FileCheck --check-prefix=DYNSYMS %s
+# RUN: llvm-readobj --dyn-syms  %t.so | FileCheck --check-prefix=DYNSYMS %s
 
 # RELOCS:      Relocations [
 # RELOCS-NEXT:   Section ({{.*}}) .rela.plt {

Modified: lld/trunk/test/ELF/dynamic-list-wildcard.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-list-wildcard.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-list-wildcard.s (original)
+++ lld/trunk/test/ELF/dynamic-list-wildcard.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 
 # RUN: echo "{ foo1*; };" > %t.list
 # RUN: ld.lld --hash-style=sysv -pie --dynamic-list %t.list %t -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/dynamic-list.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-list.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-list.s (original)
+++ lld/trunk/test/ELF/dynamic-list.s Tue Apr 30 22:49:01 2019
@@ -7,19 +7,19 @@
 ## Check exporting only one symbol.
 # RUN: echo "{ foo1; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 ## And now using quoted strings (the output is the same since it does
 ## use any wildcard character).
 # RUN: echo "{ \"foo1\"; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 ## And now using --export-dynamic-symbol.
 # RUN: ld.lld --hash-style=sysv --export-dynamic-symbol foo1 %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 # RUN: ld.lld --hash-style=sysv --export-dynamic-symbol=foo1 %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {
@@ -46,11 +46,11 @@
 ## Now export all the foo1, foo2, and foo31 symbols
 # RUN: echo "{ foo1; foo2; foo31; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK2 %s
 # RUN: echo "{ foo1; foo2; };" > %t1.list
 # RUN: echo "{ foo31; };" > %t2.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t1.list --dynamic-list %t2.list %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK2 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK2 %s
 
 # CHECK2:      DynamicSymbols [
 # CHECK2-NEXT:   Symbol {
@@ -96,11 +96,11 @@
 ## incomplete dynamic-list still exports everything.
 # RUN: echo "{ foo2; };" > %t.list
 # RUN: ld.lld --hash-style=sysv --dynamic-list %t.list --export-dynamic %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK3 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK3 %s
 
 ## The same with --export-dynamic-symbol.
 # RUN: ld.lld --hash-style=sysv --export-dynamic-symbol=foo2 --export-dynamic %t %t2.so -o %t.exe
-# RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck -check-prefix=CHECK3 %s
+# RUN: llvm-readobj --dyn-syms %t.exe | FileCheck -check-prefix=CHECK3 %s
 
 # CHECK3:      DynamicSymbols [
 # CHECK3-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/dynamic-no-rosegment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-no-rosegment.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-no-rosegment.s (original)
+++ lld/trunk/test/ELF/dynamic-no-rosegment.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --no-rosegment -z rodynamic -o %t %t.o
-# RUN: llvm-readobj -dynamic-table -s %t | FileCheck %s
+# RUN: llvm-readobj --dynamic-table -S %t | FileCheck %s
 
 # CHECK:      DynamicSection [ (7 entries)
 # CHECK-NEXT:   Tag                Type                 Name/Value

Modified: lld/trunk/test/ELF/dynamic-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic-reloc.s (original)
+++ lld/trunk/test/ELF/dynamic-reloc.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/dynamic-reloc.s -o %t3.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t3.o %t2.so -o %t
-// RUN: llvm-readobj -dynamic-table -r --expand-relocs -s %t | FileCheck %s
+// RUN: llvm-readobj --dynamic-table -r --expand-relocs -S %t | FileCheck %s
 
 // CHECK:      Index: 1
 // CHECK-NEXT: Name: .dynsym

Modified: lld/trunk/test/ELF/dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynamic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynamic.s (original)
+++ lld/trunk/test/ELF/dynamic.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 ## Check that _DYNAMIC symbol is created when creating dynamic output,
 ## and has hidden visibility and address equal to .dynamic section.
 # RUN: ld.lld -shared %t.o -o %t.so
-# RUN: llvm-readobj -sections -symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --sections --symbols %t.so | FileCheck %s
 # CHECK:      Section {
 # CHECK:        Index: 5
 # CHECK:        Name: .dynamic
@@ -35,7 +35,7 @@
 # CHECK-NEXT:   }
 
 # RUN: ld.lld %t.o -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=NODYN %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=NODYN %s
 # NODYN:    Symbols [
 # NODYN-NOT: Name: _DYNAMIC
 # NODYN:    ]

Modified: lld/trunk/test/ELF/dynsym-no-rosegment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynsym-no-rosegment.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynsym-no-rosegment.s (original)
+++ lld/trunk/test/ELF/dynsym-no-rosegment.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --no-rosegment -o %t %t.o
-# RUN: llvm-readobj -dyn-symbols -s %t | FileCheck %s
+# RUN: llvm-readobj --dyn-syms -S %t | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/dynsym-pie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dynsym-pie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/dynsym-pie.s (original)
+++ lld/trunk/test/ELF/dynsym-pie.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld -pie %t -o %t.out
-# RUN: llvm-readobj -t -dyn-symbols %t.out | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms %t.out | FileCheck %s
 
 # CHECK:       Symbols [
 # CHECK:        Symbol {

Modified: lld/trunk/test/ELF/eh-align-cie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-align-cie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-align-cie.s (original)
+++ lld/trunk/test/ELF/eh-align-cie.s Tue Apr 30 22:49:01 2019
@@ -9,7 +9,7 @@
 bar:
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: llvm-readobj -s -section-data %t.o | FileCheck --check-prefix=OBJ %s
+// RUN: llvm-readobj -S --section-data %t.o | FileCheck --check-prefix=OBJ %s
 
 // Check the size of the CIE (0x18 + 4) an FDE (0x10 + 4)
 // OBJ: Name: .eh_frame
@@ -32,7 +32,7 @@ bar:
 
 
 // RUN: ld.lld --hash-style=sysv %t.o -o %t -shared
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 // Check that the size of the CIE was changed to (0x1C + 4) and the FDE one was
 // changed to (0x14 + 4)

Modified: lld/trunk/test/ELF/eh-frame-begin-end.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-begin-end.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-begin-end.s (original)
+++ lld/trunk/test/ELF/eh-frame-begin-end.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=amd64-unknown-openbsd %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=amd64-unknown-openbsd %p/Inputs/eh-frame-end.s -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
-// RUN: llvm-readobj -sections %t | FileCheck %s
+// RUN: llvm-readobj --sections %t | FileCheck %s
 
 // CHECK:      Name: .eh_frame
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/eh-frame-gc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-gc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-gc.s (original)
+++ lld/trunk/test/ELF/eh-frame-gc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --gc-sections %t.o -o %t
-# RUN: llvm-readobj  -s %t | FileCheck %s
+# RUN: llvm-readobj  -S %t | FileCheck %s
 
 ## Check that section containing personality is
 ## not garbage collected.

Modified: lld/trunk/test/ELF/eh-frame-gc2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-gc2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-gc2.s (original)
+++ lld/trunk/test/ELF/eh-frame-gc2.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld --gc-sections %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 
 // Test that the we don't gc the personality function.
 // CHECK: Name: .foobar

Modified: lld/trunk/test/ELF/eh-frame-hdr-icf-fde.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-hdr-icf-fde.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-hdr-icf-fde.s (original)
+++ lld/trunk/test/ELF/eh-frame-hdr-icf-fde.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --eh-frame-hdr
 # RUN: llvm-readobj -r %t | FileCheck %s --check-prefix=OBJ
-# RUN: llvm-readobj -s -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t2 | FileCheck %s
 
 # OBJ:      Relocations [
 # OBJ-NEXT:   Section {{.*}} .rela.eh_frame {

Modified: lld/trunk/test/ELF/eh-frame-hdr-no-out2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-hdr-no-out2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-hdr-no-out2.s (original)
+++ lld/trunk/test/ELF/eh-frame-hdr-no-out2.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld --eh-frame-hdr %t.o -o %t
-// RUN: llvm-readobj -s -program-headers %t | FileCheck %s --check-prefix=NOHDR
+// RUN: llvm-readobj -S -l %t | FileCheck %s --check-prefix=NOHDR
 
 .section foo,"ax", at progbits
  nop

Modified: lld/trunk/test/ELF/eh-frame-hdr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-hdr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-hdr.s (original)
+++ lld/trunk/test/ELF/eh-frame-hdr.s Tue Apr 30 22:49:01 2019
@@ -2,15 +2,15 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -file-headers -s -section-data -program-headers -symbols %t \
+// RUN: llvm-readobj --file-headers -S --section-data -l --symbols %t \
 // RUN:   | FileCheck %s --check-prefix=NOHDR
 
 // RUN: ld.lld -eh-frame-hdr -no-eh-frame-hdr %t.o -o %t
-// RUN: llvm-readobj -file-headers -s -section-data -program-headers -symbols %t \
+// RUN: llvm-readobj --file-headers -S --section-data -l --symbols %t \
 // RUN:   | FileCheck %s --check-prefix=NOHDR
 
 // RUN: ld.lld --eh-frame-hdr %t.o -o %t
-// RUN: llvm-readobj -file-headers -s -section-data -program-headers -symbols %t \
+// RUN: llvm-readobj --file-headers -S --section-data -l --symbols %t \
 // RUN:   | FileCheck %s --check-prefix=HDR
 // RUN: llvm-objdump -d %t | FileCheck %s --check-prefix=HDRDISASM
 

Modified: lld/trunk/test/ELF/eh-frame-marker.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-marker.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-marker.s (original)
+++ lld/trunk/test/ELF/eh-frame-marker.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld --eh-frame-hdr %t.o -o %t.so -shared
-// RUN: llvm-readobj -t -s %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t.so | FileCheck %s
 // We used to crash on this.
 
 // CHECK:      Name: .eh_frame_hdr

Modified: lld/trunk/test/ELF/eh-frame-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-merge.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-merge.s (original)
+++ lld/trunk/test/ELF/eh-frame-merge.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o %t.o -o %t -shared
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
         .section	foo,"ax", at progbits
 	.cfi_startproc

Modified: lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata2.s (original)
+++ lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata2.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text : { *(.text) } .eh_frame : { *(.eh_frame) } }" > %t.script
 # RUN: ld.lld --eh-frame-hdr --script %t.script --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:

Modified: lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata4.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata4.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata4.s (original)
+++ lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata4.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text : { *(.text) } .eh_frame : { *(.eh_frame) } }" > %t.script
 # RUN: ld.lld --eh-frame-hdr --script %t.script --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:

Modified: lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata8.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata8.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata8.s (original)
+++ lld/trunk/test/ELF/eh-frame-negative-pcrel-sdata8.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text : { *(.text) } .eh_frame : { *(.eh_frame) } }" > %t.script
 # RUN: ld.lld --eh-frame-hdr --script %t.script --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:

Modified: lld/trunk/test/ELF/eh-frame-padding-no-rosegment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-padding-no-rosegment.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-padding-no-rosegment.s (original)
+++ lld/trunk/test/ELF/eh-frame-padding-no-rosegment.s Tue Apr 30 22:49:01 2019
@@ -12,7 +12,7 @@ bar:
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // Check the size of the CIE (0x18 + 4) and FDE (0x10 + 4)
-// RUN: llvm-readobj -s -section-data %t.o | FileCheck --check-prefix=OBJ %s
+// RUN: llvm-readobj -S --section-data %t.o | FileCheck --check-prefix=OBJ %s
 
 // OBJ:      Name: .eh_frame
 // OBJ-NEXT: Type:
@@ -42,7 +42,7 @@ bar:
 
 // Check that the CIE and FDE are padded with 0x00 and not 0xCC when the
 // .eh_frame section is placed in the executable segment
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 // CHECK:      Name: .eh_frame
 // CHECK-NEXT: Type:

Modified: lld/trunk/test/ELF/eh-frame-type.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-type.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-type.test (original)
+++ lld/trunk/test/ELF/eh-frame-type.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o -o %t -shared
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:      Name: .eh_frame
 # CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/eh-frame-value-format7.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-value-format7.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-value-format7.s (original)
+++ lld/trunk/test/ELF/eh-frame-value-format7.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --eh-frame-hdr --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 ## Check we are able to handle DW_EH_PE_udata2 encoding.
 

Modified: lld/trunk/test/ELF/eh-frame-value-format8.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/eh-frame-value-format8.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/eh-frame-value-format8.s (original)
+++ lld/trunk/test/ELF/eh-frame-value-format8.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --eh-frame-hdr --section-start .text=0x1000 %t.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 ## Check we are able to handle DW_EH_PE_absptr encoding.
 

Modified: lld/trunk/test/ELF/ehdr_start.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ehdr_start.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ehdr_start.s (original)
+++ lld/trunk/test/ELF/ehdr_start.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t
-# RUN: llvm-readobj -symbols %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:    Name: __ehdr_start (1)
 # CHECK-NEXT:    Value: 0x200000
 # CHECK-NEXT:    Size: 0
@@ -30,7 +30,7 @@ _start:
   .quad __executable_start
 
 # RUN: ld.lld -r %t.o -o %t.r
-# RUN: llvm-readobj -symbols %t.r | FileCheck %s --check-prefix=RELOCATABLE
+# RUN: llvm-readobj --symbols %t.r | FileCheck %s --check-prefix=RELOCATABLE
 
 # RELOCATABLE:    Name: __ehdr_start (1)
 # RELOCATABLE-NEXT:    Value: 0x0

Modified: lld/trunk/test/ELF/ehframe-relocation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ehframe-relocation.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ehframe-relocation.s (original)
+++ lld/trunk/test/ELF/ehframe-relocation.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/ehframe-relocation.s  -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .eh_frame

Modified: lld/trunk/test/ELF/elf-header.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/elf-header.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/elf-header.s (original)
+++ lld/trunk/test/ELF/elf-header.s Tue Apr 30 22:49:01 2019
@@ -1,10 +1,10 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t1
-# RUN: llvm-readobj -file-headers %t1 | FileCheck %s
+# RUN: llvm-readobj --file-headers %t1 | FileCheck %s
 
 # RUN: ld.lld %t.o -no-rosegment -o %t2
-# RUN: llvm-readobj -file-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck %s
 
 # CHECK:      ElfHeader {
 # CHECK-NEXT:   Ident {

Modified: lld/trunk/test/ELF/emit-relocs-mergeable-i386.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emit-relocs-mergeable-i386.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emit-relocs-mergeable-i386.s (original)
+++ lld/trunk/test/ELF/emit-relocs-mergeable-i386.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t1
 # RUN: ld.lld --emit-relocs %t1 -o %t2
-# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
 
 ## Check lf we produce proper relocations when doing merging of SHF_MERGE sections.
 

Modified: lld/trunk/test/ELF/emit-relocs-mergeable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emit-relocs-mergeable.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emit-relocs-mergeable.s (original)
+++ lld/trunk/test/ELF/emit-relocs-mergeable.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: ld.lld --emit-relocs %t1 -o %t2
-# RUN: llvm-readobj -sections -section-data -r %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data -r %t2 | FileCheck %s
 
 ## Check if we produce proper relocations when doing merging of SHF_MERGE sections.
 

Modified: lld/trunk/test/ELF/emit-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emit-relocs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emit-relocs.s (original)
+++ lld/trunk/test/ELF/emit-relocs.s Tue Apr 30 22:49:01 2019
@@ -1,15 +1,15 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: ld.lld --emit-relocs %t1.o -o %t
-# RUN: llvm-readobj -t -r -s %t | FileCheck %s
+# RUN: llvm-readobj --symbols -r -S %t | FileCheck %s
 
 ## Check single dash form.
 # RUN: ld.lld -emit-relocs %t1.o -o %t1
-# RUN: llvm-readobj -t -r -s %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols -r -S %t1 | FileCheck %s
 
 ## Check alias.
 # RUN: ld.lld -q %t1.o -o %t2
-# RUN: llvm-readobj -t -r -s %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols -r -S %t2 | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index: 2

Modified: lld/trunk/test/ELF/empty-pack-dyn-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/empty-pack-dyn-relocs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/empty-pack-dyn-relocs.s (original)
+++ lld/trunk/test/ELF/empty-pack-dyn-relocs.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.o -o %t
-// RUN: llvm-readobj -sections %t | FileCheck %s
+// RUN: llvm-readobj --sections %t | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/empty-ver.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/empty-ver.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/empty-ver.s (original)
+++ lld/trunk/test/ELF/empty-ver.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: cd %t.dir
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o t.so -shared -version-script %p/Inputs/empty-ver.ver
-// RUN: llvm-readobj -s -section-data -version-info t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --version-info t.so | FileCheck %s
 
 // CHECK:      Name: .dynstr
 // CHECK-NEXT: Type: SHT_STRTAB

Modified: lld/trunk/test/ELF/empty-ver2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/empty-ver2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/empty-ver2.s (original)
+++ lld/trunk/test/ELF/empty-ver2.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: cd %t.dir
 # RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 # RUN: ld.lld %t.o -o t.so -shared -version-script %p/Inputs/empty-ver.ver
-# RUN: llvm-readobj -version-info t.so | FileCheck %s
+# RUN: llvm-readobj --version-info t.so | FileCheck %s
 
 # CHECK:       Symbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/emulation-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation-aarch64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emulation-aarch64.s (original)
+++ lld/trunk/test/ELF/emulation-aarch64.s Tue Apr 30 22:49:01 2019
@@ -1,16 +1,16 @@
 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %taarch64
 # RUN: ld.lld -m aarch64linux %taarch64 -o %t2aarch64
-# RUN: llvm-readobj -file-headers %t2aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t2aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: ld.lld -m aarch64elf %taarch64 -o %t3aarch64
-# RUN: llvm-readobj -file-headers %t3aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t3aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: ld.lld -m aarch64_elf64_le_vec %taarch64 -o %t4aarch64
-# RUN: llvm-readobj -file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: ld.lld %taarch64 -o %t5aarch64
-# RUN: llvm-readobj -file-headers %t5aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t5aarch64 | FileCheck --check-prefix=AARCH64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-littleaarch64)' > %t4aarch64.script
 # RUN: ld.lld %t4aarch64.script %taarch64 -o %t4aarch64
-# RUN: llvm-readobj -file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
+# RUN: llvm-readobj --file-headers %t4aarch64 | FileCheck --check-prefix=AARCH64 %s
 # AARCH64:      ElfHeader {
 # AARCH64-NEXT:   Ident {
 # AARCH64-NEXT:     Magic: (7F 45 4C 46)
@@ -33,7 +33,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %taarch64fbsd
 # RUN: echo 'OUTPUT_FORMAT(elf64-aarch64-freebsd)' > %taarch64fbsd.script
 # RUN: ld.lld %taarch64fbsd.script %taarch64fbsd -o %t2aarch64fbsd
-# RUN: llvm-readobj -file-headers %t2aarch64fbsd | FileCheck --check-prefix=AARCH64-FBSD %s
+# RUN: llvm-readobj --file-headers %t2aarch64fbsd | FileCheck --check-prefix=AARCH64-FBSD %s
 # AARCH64-FBSD:      ElfHeader {
 # AARCH64-FBSD-NEXT:   Ident {
 # AARCH64-FBSD-NEXT:     Magic: (7F 45 4C 46)

Modified: lld/trunk/test/ELF/emulation-arm.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation-arm.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emulation-arm.s (original)
+++ lld/trunk/test/ELF/emulation-arm.s Tue Apr 30 22:49:01 2019
@@ -1,14 +1,14 @@
 # REQUIRES: arm
 # RUN: llvm-mc -filetype=obj -triple=armv7-unknown-linux %s -o %tarm
 # RUN: ld.lld -m armelf %tarm -o %t2arm
-# RUN: llvm-readobj -file-headers %t2arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t2arm | FileCheck --check-prefix=ARM %s
 # RUN: ld.lld -m armelf_linux_eabi %tarm -o %t3arm
-# RUN: llvm-readobj -file-headers %t3arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t3arm | FileCheck --check-prefix=ARM %s
 # RUN: ld.lld %tarm -o %t4arm
-# RUN: llvm-readobj -file-headers %t4arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t4arm | FileCheck --check-prefix=ARM %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-littlearm)' > %t5arm.script
 # RUN: ld.lld %t5arm.script %tarm -o %t5arm
-# RUN: llvm-readobj -file-headers %t5arm | FileCheck --check-prefix=ARM %s
+# RUN: llvm-readobj --file-headers %t5arm | FileCheck --check-prefix=ARM %s
 # ARM:      ElfHeader {
 # ARM-NEXT:   Ident {
 # ARM-NEXT:     Magic: (7F 45 4C 46)

Modified: lld/trunk/test/ELF/emulation-mips.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation-mips.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emulation-mips.s (original)
+++ lld/trunk/test/ELF/emulation-mips.s Tue Apr 30 22:49:01 2019
@@ -1,15 +1,15 @@
 # REQUIRES: mips
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %tmips
 # RUN: ld.lld -m elf32btsmip -e _start %tmips -o %t2mips
-# RUN: llvm-readobj -file-headers %t2mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t2mips | FileCheck --check-prefix=MIPS %s
 # RUN: ld.lld %tmips -e _start -o %t3mips
-# RUN: llvm-readobj -file-headers %t3mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t3mips | FileCheck --check-prefix=MIPS %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-tradbigmips)' > %tmips.script
 # RUN: ld.lld %tmips.script -e _start %tmips -o %t4mips
-# RUN: llvm-readobj -file-headers %t4mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t4mips | FileCheck --check-prefix=MIPS %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-bigmips)' > %tmips2.script
 # RUN: ld.lld %tmips2.script -e _start %tmips -o %t5mips
-# RUN: llvm-readobj -file-headers %t5mips | FileCheck --check-prefix=MIPS %s
+# RUN: llvm-readobj --file-headers %t5mips | FileCheck --check-prefix=MIPS %s
 # MIPS:      ElfHeader {
 # MIPS-NEXT:   Ident {
 # MIPS-NEXT:     Magic: (7F 45 4C 46)
@@ -34,14 +34,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %tmipsel
 # RUN: ld.lld -m elf32ltsmip -e _start %tmipsel -o %t2mipsel
-# RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
 # RUN: ld.lld -melf32ltsmip -e _start %tmipsel -o %t2mipsel
-# RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s
 # RUN: ld.lld %tmipsel -e _start -o %t3mipsel
-# RUN: llvm-readobj -file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-tradlittlemips)' > %tmipsel.script
 # RUN: ld.lld %tmipsel.script -e _start %tmipsel -o %t4mipsel
-# RUN: llvm-readobj -file-headers %t4mipsel | FileCheck --check-prefix=MIPSEL %s
+# RUN: llvm-readobj --file-headers %t4mipsel | FileCheck --check-prefix=MIPSEL %s
 # MIPSEL:      ElfHeader {
 # MIPSEL-NEXT:   Ident {
 # MIPSEL-NEXT:     Magic: (7F 45 4C 46)
@@ -66,12 +66,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux-gnuabin32 %s -o %tmipsn32
 # RUN: ld.lld -m elf32btsmipn32 -e _start %tmipsn32 -o %t2mipsn32
-# RUN: llvm-readobj -file-headers %t2mipsn32 | FileCheck --check-prefix=MIPSN32 %s
+# RUN: llvm-readobj --file-headers %t2mipsn32 | FileCheck --check-prefix=MIPSN32 %s
 # RUN: ld.lld %tmipsn32 -e _start -o %t3mipsn32
-# RUN: llvm-readobj -file-headers %t3mipsn32 | FileCheck --check-prefix=MIPSN32 %s
+# RUN: llvm-readobj --file-headers %t3mipsn32 | FileCheck --check-prefix=MIPSN32 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-ntradbigmips)' > %tmipsn32.script
 # RUN: ld.lld %tmipsn32.script -e _start %tmipsn32 -o %t4mipsn32
-# RUN: llvm-readobj -file-headers %t4mipsn32 | FileCheck --check-prefix=MIPSN32 %s
+# RUN: llvm-readobj --file-headers %t4mipsn32 | FileCheck --check-prefix=MIPSN32 %s
 # MIPSN32:      ElfHeader {
 # MIPSN32-NEXT:   Ident {
 # MIPSN32-NEXT:     Magic: (7F 45 4C 46)
@@ -96,14 +96,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64el-unknown-linux-gnuabin32 %s -o %tmipsn32el
 # RUN: ld.lld -m elf32ltsmipn32 -e _start %tmipsn32el -o %t2mipsn32el
-# RUN: llvm-readobj -file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # RUN: ld.lld -melf32ltsmipn32 -e _start %tmipsn32el -o %t2mipsn32el
-# RUN: llvm-readobj -file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t2mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # RUN: ld.lld %tmipsn32el -e _start -o %t3mipsn32el
-# RUN: llvm-readobj -file-headers %t3mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t3mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-ntradlittlemips)' > %tmipsn32el.script
 # RUN: ld.lld %tmipsn32el.script -e _start %tmipsn32el -o %t4mipsn32el
-# RUN: llvm-readobj -file-headers %t4mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
+# RUN: llvm-readobj --file-headers %t4mipsn32el | FileCheck --check-prefix=MIPSN32EL %s
 # MIPSN32EL:      ElfHeader {
 # MIPSN32EL-NEXT:   Ident {
 # MIPSN32EL-NEXT:     Magic: (7F 45 4C 46)
@@ -129,12 +129,12 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux -position-independent \
 # RUN:         %s -o %tmips64
 # RUN: ld.lld -m elf64btsmip -e _start %tmips64 -o %t2mips64
-# RUN: llvm-readobj -file-headers %t2mips64 | FileCheck --check-prefix=MIPS64 %s
+# RUN: llvm-readobj --file-headers %t2mips64 | FileCheck --check-prefix=MIPS64 %s
 # RUN: ld.lld %tmips64 -e _start -o %t3mips64
-# RUN: llvm-readobj -file-headers %t3mips64 | FileCheck --check-prefix=MIPS64 %s
+# RUN: llvm-readobj --file-headers %t3mips64 | FileCheck --check-prefix=MIPS64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-tradbigmips)' > %tmips64.script
 # RUN: ld.lld %tmips64.script -e _start %tmips64 -o %t4mips64
-# RUN: llvm-readobj -file-headers %t4mips64 | FileCheck --check-prefix=MIPS64 %s
+# RUN: llvm-readobj --file-headers %t4mips64 | FileCheck --check-prefix=MIPS64 %s
 # MIPS64:      ElfHeader {
 # MIPS64-NEXT:   Ident {
 # MIPS64-NEXT:     Magic: (7F 45 4C 46)
@@ -160,12 +160,12 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64el-unknown-linux \
 # RUN:         -position-independent %s -o %tmips64el
 # RUN: ld.lld -m elf64ltsmip -e _start %tmips64el -o %t2mips64el
-# RUN: llvm-readobj -file-headers %t2mips64el | FileCheck --check-prefix=MIPS64EL %s
+# RUN: llvm-readobj --file-headers %t2mips64el | FileCheck --check-prefix=MIPS64EL %s
 # RUN: ld.lld %tmips64el -e _start -o %t3mips64el
-# RUN: llvm-readobj -file-headers %t3mips64el | FileCheck --check-prefix=MIPS64EL %s
+# RUN: llvm-readobj --file-headers %t3mips64el | FileCheck --check-prefix=MIPS64EL %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-tradlittlemips)' > %tmips64el.script
 # RUN: ld.lld %tmips64el.script -e _start %tmips64el -o %t4mips64el
-# RUN: llvm-readobj -file-headers %t4mips64el | FileCheck --check-prefix=MIPS64EL %s
+# RUN: llvm-readobj --file-headers %t4mips64el | FileCheck --check-prefix=MIPS64EL %s
 # MIPS64EL:      ElfHeader {
 # MIPS64EL-NEXT:   Ident {
 # MIPS64EL-NEXT:     Magic: (7F 45 4C 46)

Modified: lld/trunk/test/ELF/emulation-ppc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation-ppc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emulation-ppc.s (original)
+++ lld/trunk/test/ELF/emulation-ppc.s Tue Apr 30 22:49:01 2019
@@ -1,12 +1,12 @@
 # REQUIRES: ppc
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %tppc64
 # RUN: ld.lld -m elf64ppc %tppc64 -o %t2ppc64
-# RUN: llvm-readobj -file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
+# RUN: llvm-readobj --file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
 # RUN: ld.lld %tppc64 -o %t3ppc64
-# RUN: llvm-readobj -file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s
+# RUN: llvm-readobj --file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-powerpc)' > %tppc64.script
 # RUN: ld.lld %tppc64.script  %tppc64 -o %t4ppc64
-# RUN: llvm-readobj -file-headers %t4ppc64 | FileCheck --check-prefix=PPC64 %s
+# RUN: llvm-readobj --file-headers %t4ppc64 | FileCheck --check-prefix=PPC64 %s
 
 # PPC64:      ElfHeader {
 # PPC64-NEXT:   Ident {
@@ -38,7 +38,7 @@
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-freebsd %s -o %tppc64fbsd
 # RUN: echo 'OUTPUT_FORMAT(elf64-powerpc-freebsd)' > %tppc64fbsd.script
 # RUN: ld.lld %tppc64fbsd.script  %tppc64fbsd -o %t2ppc64fbsd
-# RUN: llvm-readobj -file-headers %t2ppc64fbsd | FileCheck --check-prefix=PPC64-FBSD %s
+# RUN: llvm-readobj --file-headers %t2ppc64fbsd | FileCheck --check-prefix=PPC64-FBSD %s
 
 # PPC64-FBSD:      ElfHeader {
 # PPC64-FBSD-NEXT:   Ident {
@@ -69,12 +69,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %tppc64le
 # RUN: ld.lld -m elf64lppc %tppc64le -o %t2ppc64le
-# RUN: llvm-readobj -file-headers %t2ppc64le | FileCheck --check-prefix=PPC64LE %s
+# RUN: llvm-readobj --file-headers %t2ppc64le | FileCheck --check-prefix=PPC64LE %s
 # RUN: ld.lld %tppc64le -o %t3ppc64le
-# RUN: llvm-readobj -file-headers %t3ppc64le | FileCheck --check-prefix=PPC64LE %s
+# RUN: llvm-readobj --file-headers %t3ppc64le | FileCheck --check-prefix=PPC64LE %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-powerpcle)' > %tppc64le.script
 # RUN: ld.lld %tppc64le.script  %tppc64le -o %t4ppc64le
-# RUN: llvm-readobj -file-headers %t4ppc64le | FileCheck --check-prefix=PPC64LE %s
+# RUN: llvm-readobj --file-headers %t4ppc64le | FileCheck --check-prefix=PPC64LE %s
 
 # PPC64LE:      ElfHeader {
 # PPC64LE-NEXT:   Ident {
@@ -105,14 +105,14 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux %s -o %tppc32
 # RUN: ld.lld -m elf32ppc %tppc32 -o %t2ppc32
-# RUN: llvm-readobj -file-headers %t2ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t2ppc32 | FileCheck --check-prefix=PPC32 %s
 # RUN: ld.lld %tppc32 -o %t3ppc32
-# RUN: llvm-readobj -file-headers %t3ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t3ppc32 | FileCheck --check-prefix=PPC32 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-powerpc)' > %tppc32.script
 # RUN: ld.lld %tppc32.script  %tppc32 -o %t4ppc32
-# RUN: llvm-readobj -file-headers %t4ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t4ppc32 | FileCheck --check-prefix=PPC32 %s
 # RUN: ld.lld -m elf32ppclinux %tppc32 -o %t5ppc32
-# RUN: llvm-readobj -file-headers %t5ppc32 | FileCheck --check-prefix=PPC32 %s
+# RUN: llvm-readobj --file-headers %t5ppc32 | FileCheck --check-prefix=PPC32 %s
 
 # PPC32:      ElfHeader {
 # PPC32-NEXT:   Ident {

Modified: lld/trunk/test/ELF/emulation-x86.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation-x86.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/emulation-x86.s (original)
+++ lld/trunk/test/ELF/emulation-x86.s Tue Apr 30 22:49:01 2019
@@ -1,15 +1,15 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %tx64
 # RUN: ld.lld -m elf_amd64_fbsd %tx64 -o %t2x64
-# RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t2x64 | FileCheck --check-prefix=AMD64 %s
 # RUN: ld.lld %tx64 -o %t3x64
-# RUN: llvm-readobj -file-headers %t3x64 | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t3x64 | FileCheck --check-prefix=AMD64 %s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.sysv
 # RUN: ld.lld -m elf_amd64_fbsd %t.sysv -o %t.freebsd
-# RUN: llvm-readobj -file-headers %t.freebsd | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t.freebsd | FileCheck --check-prefix=AMD64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-x86-64-freebsd)' > %t4x64.script
 # RUN: ld.lld %t4x64.script %tx64 -o %t4x64
-# RUN: llvm-readobj -file-headers %t4x64 | FileCheck --check-prefix=AMD64 %s
+# RUN: llvm-readobj --file-headers %t4x64 | FileCheck --check-prefix=AMD64 %s
 # AMD64:      ElfHeader {
 # AMD64-NEXT:   Ident {
 # AMD64-NEXT:     Magic: (7F 45 4C 46)
@@ -38,13 +38,13 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %tx64
 # RUN: ld.lld -m elf_x86_64 %tx64 -o %t2x64
-# RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=X86-64 %s
+# RUN: llvm-readobj --file-headers %t2x64 | FileCheck --check-prefix=X86-64 %s
 # RUN: ld.lld %tx64 -o %t3x64
-# RUN: llvm-readobj -file-headers %t3x64 | FileCheck --check-prefix=X86-64 %s
+# RUN: llvm-readobj --file-headers %t3x64 | FileCheck --check-prefix=X86-64 %s
 # RUN: echo 'OUTPUT_FORMAT(elf64-x86-64)' > %t4x64.script
 # RUN: ld.lld %t4x64.script %tx64 -o %t4x64
 # RUN: ld.lld %tx64 -o %t4x64 %t4x64.script
-# RUN: llvm-readobj -file-headers %t4x64 | FileCheck --check-prefix=X86-64 %s
+# RUN: llvm-readobj --file-headers %t4x64 | FileCheck --check-prefix=X86-64 %s
 # X86-64:      ElfHeader {
 # X86-64-NEXT:   Ident {
 # X86-64-NEXT:     Magic: (7F 45 4C 46)
@@ -73,12 +73,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux-gnux32 %s -o %tx32
 # RUN: ld.lld -m elf32_x86_64 %tx32 -o %t2x32
-# RUN: llvm-readobj -file-headers %t2x32 | FileCheck --check-prefix=X32 %s
+# RUN: llvm-readobj --file-headers %t2x32 | FileCheck --check-prefix=X32 %s
 # RUN: ld.lld %tx32 -o %t3x32
-# RUN: llvm-readobj -file-headers %t3x32 | FileCheck --check-prefix=X32 %s
+# RUN: llvm-readobj --file-headers %t3x32 | FileCheck --check-prefix=X32 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-x86-64)' > %t4x32.script
 # RUN: ld.lld %t4x32.script %tx32 -o %t4x32
-# RUN: llvm-readobj -file-headers %t4x32 | FileCheck --check-prefix=X32 %s
+# RUN: llvm-readobj --file-headers %t4x32 | FileCheck --check-prefix=X32 %s
 # X32:      ElfHeader {
 # X32-NEXT:   Ident {
 # X32-NEXT:     Magic: (7F 45 4C 46)
@@ -107,12 +107,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %tx86
 # RUN: ld.lld -m elf_i386 %tx86 -o %t2x86
-# RUN: llvm-readobj -file-headers %t2x86 | FileCheck --check-prefix=X86 %s
+# RUN: llvm-readobj --file-headers %t2x86 | FileCheck --check-prefix=X86 %s
 # RUN: ld.lld %tx86 -o %t3x86
-# RUN: llvm-readobj -file-headers %t3x86 | FileCheck --check-prefix=X86 %s
+# RUN: llvm-readobj --file-headers %t3x86 | FileCheck --check-prefix=X86 %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-i386)' > %t4x86.script
 # RUN: ld.lld %t4x86.script %tx86 -o %t4x86
-# RUN: llvm-readobj -file-headers %t4x86 | FileCheck --check-prefix=X86 %s
+# RUN: llvm-readobj --file-headers %t4x86 | FileCheck --check-prefix=X86 %s
 # X86:      ElfHeader {
 # X86-NEXT:   Ident {
 # X86-NEXT:     Magic: (7F 45 4C 46)
@@ -141,12 +141,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-freebsd %s -o %tx86fbsd
 # RUN: ld.lld -m elf_i386_fbsd %tx86fbsd -o %t2x86fbsd
-# RUN: llvm-readobj -file-headers %t2x86fbsd | FileCheck --check-prefix=X86FBSD %s
+# RUN: llvm-readobj --file-headers %t2x86fbsd | FileCheck --check-prefix=X86FBSD %s
 # RUN: ld.lld %tx86fbsd -o %t3x86fbsd
-# RUN: llvm-readobj -file-headers %t3x86fbsd | FileCheck --check-prefix=X86FBSD %s
+# RUN: llvm-readobj --file-headers %t3x86fbsd | FileCheck --check-prefix=X86FBSD %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-i386-freebsd)' > %t4x86fbsd.script
 # RUN: ld.lld %t4x86fbsd.script %tx86fbsd -o %t4x86fbsd
-# RUN: llvm-readobj -file-headers %t4x86fbsd | FileCheck --check-prefix=X86FBSD %s
+# RUN: llvm-readobj --file-headers %t4x86fbsd | FileCheck --check-prefix=X86FBSD %s
 # X86FBSD:      ElfHeader {
 # X86FBSD-NEXT:   Ident {
 # X86FBSD-NEXT:     Magic: (7F 45 4C 46)
@@ -175,12 +175,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i586-intel-elfiamcu %s -o %tiamcu
 # RUN: ld.lld -m elf_iamcu %tiamcu -o %t2iamcu
-# RUN: llvm-readobj -file-headers %t2iamcu | FileCheck --check-prefix=IAMCU %s
+# RUN: llvm-readobj --file-headers %t2iamcu | FileCheck --check-prefix=IAMCU %s
 # RUN: ld.lld %tiamcu -o %t3iamcu
-# RUN: llvm-readobj -file-headers %t3iamcu | FileCheck --check-prefix=IAMCU %s
+# RUN: llvm-readobj --file-headers %t3iamcu | FileCheck --check-prefix=IAMCU %s
 # RUN: echo 'OUTPUT_FORMAT(elf32-iamcu)' > %t4iamcu.script
 # RUN: ld.lld %t4iamcu.script %tiamcu -o %t4iamcu
-# RUN: llvm-readobj -file-headers %t4iamcu | FileCheck --check-prefix=IAMCU %s
+# RUN: llvm-readobj --file-headers %t4iamcu | FileCheck --check-prefix=IAMCU %s
 # IAMCU:      ElfHeader {
 # IAMCU-NEXT:   Ident {
 # IAMCU-NEXT:     Magic: (7F 45 4C 46)

Modified: lld/trunk/test/ELF/end-update.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/end-update.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/end-update.s (original)
+++ lld/trunk/test/ELF/end-update.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -sections -symbols %t | FileCheck %s
+// RUN: llvm-readobj --sections --symbols %t | FileCheck %s
 
 // CHECK: Sections [
 // CHECK:     Name: .bss

Modified: lld/trunk/test/ELF/end.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/end.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/end.s (original)
+++ lld/trunk/test/ELF/end.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 
 // By default, the .bss section is the latest section of the data segment.
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -sections -symbols %t | FileCheck %s --check-prefix=DEFAULT
+// RUN: llvm-readobj --sections --symbols %t | FileCheck %s --check-prefix=DEFAULT
 
 // DEFAULT: Sections [
 // DEFAULT:     Name: .bss

Modified: lld/trunk/test/ELF/entry.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/entry.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/entry.s (original)
+++ lld/trunk/test/ELF/entry.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 
 # RUN: ld.lld -e foobar %t1 -o %t2 2>&1 | FileCheck -check-prefix=WARN1 %s
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=TEXT %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=TEXT %s
 
 # WARN1: warning: cannot find entry symbol foobar; defaulting to 0x201000
 # TEXT: Entry: 0x201000
@@ -19,7 +19,7 @@
 # RUN: echo .data > %t.s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux -n %t.s -o %t3
 # RUN: ld.lld %t3 -o %t4 2>&1 | FileCheck -check-prefix=WARN4 %s
-# RUN: llvm-readobj -file-headers %t4 | FileCheck -check-prefix=NOENTRY %s
+# RUN: llvm-readobj --file-headers %t4 | FileCheck -check-prefix=NOENTRY %s
 
 # WARN4: cannot find entry symbol _start; not setting start address
 # NOENTRY: Entry: 0x0
@@ -28,23 +28,23 @@
 # WARN5-NOT: warning: cannot find entry symbol
 
 # RUN: ld.lld %t1 -o %t2 -e entry
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=SYM %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=SYM %s
 # SYM: Entry: 0x201008
 
 # RUN: ld.lld %t1 --fatal-warnings -shared -o %t2 -e entry
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=DSO %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=DSO %s
 # DSO: Entry: 0x1008
 
 # RUN: ld.lld %t1 -o %t2 --entry=4096
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=DEC %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=DEC %s
 # DEC: Entry: 0x1000
 
 # RUN: ld.lld %t1 -o %t2 --entry 0xcafe
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=HEX %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=HEX %s
 # HEX: Entry: 0xCAFE
 
 # RUN: ld.lld %t1 -o %t2 -e 0777
-# RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=OCT %s
+# RUN: llvm-readobj --file-headers %t2 | FileCheck -check-prefix=OCT %s
 # OCT: Entry: 0x1FF
 
 .globl entry

Modified: lld/trunk/test/ELF/exclude-libs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/exclude-libs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/exclude-libs.s (original)
+++ lld/trunk/test/ELF/exclude-libs.s Tue Apr 30 22:49:01 2019
@@ -9,28 +9,28 @@
 // RUN: llvm-ar rcs %t.dir/exc.a %t2.o %t3.o
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs=foo,bar
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo,bar,exc.a
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo:bar:exc.a
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared %t.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared %t.o %t2.o %t3.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=DEFAULT %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=DEFAULT %s
 
 // RUN: ld.lld -shared --whole-archive %t.o %t.dir/exc.a -o %t.exe --exclude-libs foo,bar,exc.a
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // RUN: ld.lld -shared --whole-archive %t.o %t.dir/exc.a -o %t.exe --exclude-libs=ALL
-// RUN: llvm-readobj -dyn-symbols %t.exe | FileCheck --check-prefix=EXCLUDE %s
+// RUN: llvm-readobj --dyn-syms %t.exe | FileCheck --check-prefix=EXCLUDE %s
 
 // DEFAULT: Name: fn
 // DEFAULT: Name: fn2

Modified: lld/trunk/test/ELF/fill-trap-ppc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/fill-trap-ppc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/fill-trap-ppc.s (original)
+++ lld/trunk/test/ELF/fill-trap-ppc.s Tue Apr 30 22:49:01 2019
@@ -2,12 +2,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.ppc64le
-# RUN: llvm-readobj -program-headers %t.ppc64le | FileCheck %s
+# RUN: llvm-readobj -l %t.ppc64le | FileCheck %s
 # RUN: od -Ax -t x1 -N16 -j0x10ff0 %t.ppc64le | FileCheck %s -check-prefix=LE
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.ppc64
-# RUN: llvm-readobj -program-headers %t.ppc64 | FileCheck %s
+# RUN: llvm-readobj -l %t.ppc64 | FileCheck %s
 # RUN: od -Ax -t x1 -N16 -j0x10ff0 %t.ppc64 | FileCheck %s -check-prefix=BE
 
 # CHECK: ProgramHeader {

Modified: lld/trunk/test/ELF/fill-trap.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/fill-trap.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/fill-trap.s (original)
+++ lld/trunk/test/ELF/fill-trap.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 # RUN: od -Ax -x -N16 -j0x1ff0 %t2 | FileCheck %s -check-prefix=FILL
 
 # CHECK: ProgramHeader {

Modified: lld/trunk/test/ELF/format-binary-non-ascii.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/format-binary-non-ascii.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/format-binary-non-ascii.s (original)
+++ lld/trunk/test/ELF/format-binary-non-ascii.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t£.o
 
 # RUN: ld.lld -o %t.elf %t£.o --format=binary %t£.o
-# RUN: llvm-readobj -symbols %t.elf | FileCheck %s
+# RUN: llvm-readobj --symbols %t.elf | FileCheck %s
 
 # CHECK: Name: _binary_{{[a-zA-Z0-9_]+}}test_ELF_Output_format_binary_non_ascii_s_tmp_{{[_]+}}o_start
 # CHECK: Name: _binary_{{[a-zA-Z0-9_]+}}test_ELF_Output_format_binary_non_ascii_s_tmp_{{[_]+}}o_end

Modified: lld/trunk/test/ELF/gc-debuginfo-tls.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-debuginfo-tls.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-debuginfo-tls.s (original)
+++ lld/trunk/test/ELF/gc-debuginfo-tls.s Tue Apr 30 22:49:01 2019
@@ -2,8 +2,8 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o --gc-sections -shared -o %t1
 # RUN: ld.lld %t.o -shared -o %t2
-# RUN: llvm-readobj -symbols %t1 | FileCheck %s --check-prefix=GC
-# RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=NOGC
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s --check-prefix=GC
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=NOGC
 
 # NOGC:      Symbol {
 # NOGC:        Name: patatino

Modified: lld/trunk/test/ELF/gc-merge-local-sym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-merge-local-sym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-merge-local-sym.s (original)
+++ lld/trunk/test/ELF/gc-merge-local-sym.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared -O3 --gc-sections
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck %s
 
 // CHECK:      Name: .rodata
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/gc-sections-alloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-alloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-alloc.s (original)
+++ lld/trunk/test/ELF/gc-sections-alloc.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --gc-sections -shared
-# RUN: llvm-readobj -sections  -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections  --section-data %t2 | FileCheck %s
 
 # Non alloca section .bar should not keep section .foo alive.
 

Modified: lld/trunk/test/ELF/gc-sections-eh.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-eh.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-eh.s (original)
+++ lld/trunk/test/ELF/gc-sections-eh.s Tue Apr 30 22:49:01 2019
@@ -3,11 +3,11 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 # RUN: ld.lld %t -o %t2 --gc-sections
-# RUN: llvm-readobj -t %t2 | FileCheck %s
+# RUN: llvm-readobj --symbols %t2 | FileCheck %s
 # RUN: llvm-objdump --dwarf=frames %t2 | FileCheck --check-prefix=EH %s
 
 # RUN: ld.lld %t -o %t3
-# RUN: llvm-readobj -t %t3 | FileCheck --check-prefix=NOGC %s
+# RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=NOGC %s
 # RUN: llvm-objdump --dwarf=frames %t3 | FileCheck --check-prefix=EHNOGC %s
 
 # CHECK-NOT: foo

Modified: lld/trunk/test/ELF/gc-sections-implicit-addend.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-implicit-addend.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-implicit-addend.s (original)
+++ lld/trunk/test/ELF/gc-sections-implicit-addend.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --gc-sections
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 # RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 # CHECK:      Name: .foo

Modified: lld/trunk/test/ELF/gc-sections-local-sym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-local-sym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-local-sym.s (original)
+++ lld/trunk/test/ELF/gc-sections-local-sym.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2 -shared --gc-sections
-// RUN: llvm-readobj -t -s -section-data %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols -S --section-data %t2 | FileCheck %s
 
 .global foo
 foo:

Modified: lld/trunk/test/ELF/gc-sections-lsda.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-lsda.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-lsda.s (original)
+++ lld/trunk/test/ELF/gc-sections-lsda.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 // precise and gc the entire contents of this file, but test that at least
 // we are consistent: if we keep .abc, we have to keep .foo
 
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 // CHECK:  Name: .abc
 // CHECK: Name: .foo
 

Modified: lld/trunk/test/ELF/gc-sections-merge-addend.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-merge-addend.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-merge-addend.s (original)
+++ lld/trunk/test/ELF/gc-sections-merge-addend.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 
 // CHECK:      Name: .rodata

Modified: lld/trunk/test/ELF/gc-sections-merge-implicit-addend.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-merge-implicit-addend.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-merge-implicit-addend.s (original)
+++ lld/trunk/test/ELF/gc-sections-merge-implicit-addend.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=i386-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 
 // CHECK:      Name: .rodata

Modified: lld/trunk/test/ELF/gc-sections-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-merge.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-merge.s (original)
+++ lld/trunk/test/ELF/gc-sections-merge.s Tue Apr 30 22:49:01 2019
@@ -2,8 +2,8 @@
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared
 // RUN: ld.lld %t.o -o %t.gc.so -shared --gc-sections
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
-// RUN: llvm-readobj -s -section-data %t.gc.so | FileCheck --check-prefix=GC %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.gc.so | FileCheck --check-prefix=GC %s
 
 
 // CHECK:      Name: .rodata

Modified: lld/trunk/test/ELF/gc-sections-non-alloc-to-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-non-alloc-to-merge.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-non-alloc-to-merge.s (original)
+++ lld/trunk/test/ELF/gc-sections-non-alloc-to-merge.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --gc-sections
-# RUN: llvm-readobj -s --elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readobj -S --elf-output-style=GNU %t | FileCheck %s
 
 # CHECK:  .merge1     PROGBITS    {{[0-9a-z]*}} {{[0-9a-z]*}} 000004
 

Modified: lld/trunk/test/ELF/gc-sections-protected.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-protected.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-protected.s (original)
+++ lld/trunk/test/ELF/gc-sections-protected.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 // CHECK:      Name: .text
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/gc-sections-synthetic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-synthetic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-synthetic.s (original)
+++ lld/trunk/test/ELF/gc-sections-synthetic.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: ld.lld %t1 -shared -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
 # RUN: ld.lld %t2 %t.so -build-id -dynamic-linker /foo/bar -o %t.out
-# RUN: llvm-readobj -sections %t.out | FileCheck %s
+# RUN: llvm-readobj --sections %t.out | FileCheck %s
 
 # CHECK: Name: .interp
 # CHECK: Name: .note.gnu.build-id

Modified: lld/trunk/test/ELF/gc-sections-undefined.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-undefined.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-undefined.s (original)
+++ lld/trunk/test/ELF/gc-sections-undefined.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t1 --gc-sections --undefined=foo
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK: foo
 

Modified: lld/trunk/test/ELF/gc-sections-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-weak.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections-weak.s (original)
+++ lld/trunk/test/ELF/gc-sections-weak.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/gc-sections-weak.s -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t.so -shared --gc-sections
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 .global foo
 foo:

Modified: lld/trunk/test/ELF/gc-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gc-sections.s (original)
+++ lld/trunk/test/ELF/gc-sections.s Tue Apr 30 22:49:01 2019
@@ -2,11 +2,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=NOGC %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=NOGC %s
 # RUN: ld.lld --gc-sections %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC1 %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=GC1 %s
 # RUN: ld.lld --export-dynamic --gc-sections %t -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC2 %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=GC2 %s
 
 # NOGC: Name: .eh_frame
 # NOGC: Name: .text

Modified: lld/trunk/test/ELF/gdb-index.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gdb-index.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gdb-index.s (original)
+++ lld/trunk/test/ELF/gdb-index.s Tue Apr 30 22:49:01 2019
@@ -48,7 +48,7 @@
 # SECTION-NOT: debug_gnu_pubnames
 
 # RUN: ld.lld --gdb-index --no-gdb-index %t1.o %t2.o -o %t2
-# RUN: llvm-readobj -sections %t2 | FileCheck -check-prefix=NOGDB %s
+# RUN: llvm-readobj --sections %t2 | FileCheck -check-prefix=NOGDB %s
 # NOGDB-NOT: Name: .gdb_index
 
 ## The following section contents are created by this using gcc 7.1.0:

Modified: lld/trunk/test/ELF/global-offset-table-position-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/global-offset-table-position-aarch64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/global-offset-table-position-aarch64.s (original)
+++ lld/trunk/test/ELF/global-offset-table-position-aarch64.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 .globl  a
 .type   a, at object
 .comm   a,4,4

Modified: lld/trunk/test/ELF/global-offset-table-position-arm.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/global-offset-table-position-arm.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/global-offset-table-position-arm.s (original)
+++ lld/trunk/test/ELF/global-offset-table-position-arm.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-linux-gnueabihf %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The ARM _GLOBAL_OFFSET_TABLE_ should be defined at the start of the .got
 .globl  a

Modified: lld/trunk/test/ELF/global-offset-table-position-i386.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/global-offset-table-position-i386.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/global-offset-table-position-i386.s (original)
+++ lld/trunk/test/ELF/global-offset-table-position-i386.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The X86 _GLOBAL_OFFSET_TABLE_ is defined at the start of the .got.plt
 // section.

Modified: lld/trunk/test/ELF/global-offset-table-position-mips.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/global-offset-table-position-mips.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/global-offset-table-position-mips.s (original)
+++ lld/trunk/test/ELF/global-offset-table-position-mips.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: mips
 // RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t
 // RUN: ld.lld -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The Mips _GLOBAL_OFFSET_TABLE_ should be defined at the start of the .got
 

Modified: lld/trunk/test/ELF/global-offset-table-position.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/global-offset-table-position.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/global-offset-table-position.s (original)
+++ lld/trunk/test/ELF/global-offset-table-position.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // The X86_64 _GLOBAL_OFFSET_TABLE_ is defined at the start of the .got.plt
 // section.

Modified: lld/trunk/test/ELF/global_offset_table_shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/global_offset_table_shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/global_offset_table_shared.s (original)
+++ lld/trunk/test/ELF/global_offset_table_shared.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 .long _GLOBAL_OFFSET_TABLE_ - .
 
 // CHECK:      Name: _GLOBAL_OFFSET_TABLE_

Modified: lld/trunk/test/ELF/gnu-hash-table-rwsegment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-hash-table-rwsegment.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-hash-table-rwsegment.s (original)
+++ lld/trunk/test/ELF/gnu-hash-table-rwsegment.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared -hash-style=gnu --no-rosegment -o %t.so %t.o
-# RUN: llvm-readobj -gnu-hash-table %t.so | FileCheck %s
+# RUN: llvm-readobj --gnu-hash-table %t.so | FileCheck %s
 
 # CHECK:      GnuHashTable {
 # CHECK-NEXT:   Num Buckets: 1

Modified: lld/trunk/test/ELF/gnu-hash-table.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-hash-table.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-hash-table.s (original)
+++ lld/trunk/test/ELF/gnu-hash-table.s Tue Apr 30 22:49:01 2019
@@ -36,15 +36,15 @@
 # RUN: ld.lld -shared --hash-style both -o %t-ppc64le.so  %t-ppc64le.o  %t2-ppc64le.a  %t3-ppc64le.so
 # RUN: ld.lld -shared --hash-style both -o %t-ppc64.so  %t-ppc64.o  %t2-ppc64.a  %t3-ppc64.so
 
-# RUN: llvm-readobj -dyn-symbols -gnu-hash-table %te-i386.so \
+# RUN: llvm-readobj --dyn-syms --gnu-hash-table %te-i386.so \
 # RUN:   | FileCheck %s -check-prefix=EMPTY
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-i386.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-i386.so \
 # RUN:   | FileCheck %s -check-prefix=I386
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-x86_64.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-x86_64.so \
 # RUN:   | FileCheck %s -check-prefix=X86_64
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-ppc64le.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-ppc64le.so \
 # RUN:   | FileCheck %s -check-prefix=PPC64
-# RUN: llvm-readobj -sections -dyn-symbols -gnu-hash-table %t-ppc64.so \
+# RUN: llvm-readobj --sections --dyn-syms --gnu-hash-table %t-ppc64.so \
 # RUN:   | FileCheck %s -check-prefix=PPC64
 
 # EMPTY:      DynamicSymbols [

Modified: lld/trunk/test/ELF/gnu-ifunc-canon.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-canon.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-canon.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-canon.s Tue Apr 30 22:49:01 2019
@@ -4,33 +4,33 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/gnu-ifunc-canon-ro-abs.s -o %t-ro-abs.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/gnu-ifunc-canon-rw-addend.s -o %t-rw-addend.o
 // RUN: ld.lld %t.o -o %t1
-// RUN: llvm-readobj -relocs %t1 | FileCheck --check-prefix=IREL2 %s
+// RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=IREL2 %s
 // RUN: ld.lld %t.o %t-ro-pcrel.o -o %t2
-// RUN: llvm-readobj -relocs %t2 | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-readobj -r %t2 | FileCheck --check-prefix=IREL1 %s
 // RUN: ld.lld %t.o %t-ro-abs.o -o %t3
-// RUN: llvm-readobj -relocs %t3 | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-readobj -r %t3 | FileCheck --check-prefix=IREL1 %s
 // RUN: ld.lld %t.o %t-rw-addend.o -o %t4
-// RUN: llvm-readobj -relocs %t4 | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-readobj -r %t4 | FileCheck --check-prefix=IREL1 %s
 // RUN: llvm-objdump -s %t4 | FileCheck --check-prefix=DUMP %s
 // RUN: ld.lld %t.o %t-rw-addend.o -o %t4a -z retpolineplt
-// RUN: llvm-readobj -relocs %t4a | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-readobj -r %t4a | FileCheck --check-prefix=IREL1 %s
 // RUN: llvm-objdump -s %t4a | FileCheck --check-prefix=DUMP2 %s
 // RUN: ld.lld %t-ro-pcrel.o %t.o -o %t5
-// RUN: llvm-readobj -relocs %t5 | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-readobj -r %t5 | FileCheck --check-prefix=IREL1 %s
 // RUN: ld.lld %t-ro-abs.o %t.o -o %t6
-// RUN: llvm-readobj -relocs %t6 | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-readobj -r %t6 | FileCheck --check-prefix=IREL1 %s
 // RUN: ld.lld %t-rw-addend.o %t.o -o %t7
-// RUN: llvm-readobj -relocs %t7 | FileCheck --check-prefix=IREL1 %s
+// RUN: llvm-readobj -r %t7 | FileCheck --check-prefix=IREL1 %s
 // RUN: ld.lld %t.o -o %t8 -pie
-// RUN: llvm-readobj -relocs %t8 | FileCheck --check-prefix=IREL2 %s
+// RUN: llvm-readobj -r %t8 | FileCheck --check-prefix=IREL2 %s
 // RUN: ld.lld %t.o %t-ro-pcrel.o -o %t9 -pie
-// RUN: llvm-readobj -relocs %t9 | FileCheck --check-prefix=IREL1-REL2 %s
+// RUN: llvm-readobj -r %t9 | FileCheck --check-prefix=IREL1-REL2 %s
 // RUN: ld.lld %t.o %t-rw-addend.o -o %t10 -pie
-// RUN: llvm-readobj -relocs %t10 | FileCheck --check-prefix=IREL1-REL3 %s
+// RUN: llvm-readobj -r %t10 | FileCheck --check-prefix=IREL1-REL3 %s
 // RUN: ld.lld %t-ro-pcrel.o %t.o -o %t11 -pie
-// RUN: llvm-readobj -relocs %t11 | FileCheck --check-prefix=IREL1-REL2 %s
+// RUN: llvm-readobj -r %t11 | FileCheck --check-prefix=IREL1-REL2 %s
 // RUN: ld.lld %t-rw-addend.o %t.o -o %t12 -pie
-// RUN: llvm-readobj -relocs %t12 | FileCheck --check-prefix=IREL1-REL3 %s
+// RUN: llvm-readobj -r %t12 | FileCheck --check-prefix=IREL1-REL3 %s
 
 // Two relocs, one for the GOT and the other for .data.
 // IREL2-NOT: R_X86_64_

Modified: lld/trunk/test/ELF/gnu-ifunc-dso.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-dso.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-dso.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-dso.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: ld.lld -shared %t1.o -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
 # RUN: ld.lld -shared %t2.o %t.so -o %t
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
 # CHECK-NEXT:   0x2000 R_X86_64_64 foo 0x0

Modified: lld/trunk/test/ELF/gnu-ifunc-dyntags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-dyntags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-dyntags.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-dyntags.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -pie %t.o -o %tout
 # RUN: llvm-objdump -section-headers %tout | FileCheck %s
-# RUN: llvm-readobj -dynamic-table -r %tout | FileCheck %s --check-prefix=TAGS
+# RUN: llvm-readobj --dynamic-table -r %tout | FileCheck %s --check-prefix=TAGS
 
 ## Check we produce DT_PLTREL/DT_JMPREL/DT_PLTGOT and DT_PLTRELSZ tags
 ## when there are no other relocations except R_*_IRELATIVE.

Modified: lld/trunk/test/ELF/gnu-ifunc-gotpcrel.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-gotpcrel.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-gotpcrel.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-gotpcrel.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
 # CHECK-NEXT:   0x2020B0 R_X86_64_GLOB_DAT foo 0x0

Modified: lld/trunk/test/ELF/gnu-ifunc-i386.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-i386.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-i386.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-i386.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
 
 // CHECK:      Sections [
 // CHECK:       Section {

Modified: lld/trunk/test/ELF/gnu-ifunc-nosym-i386.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-nosym-i386.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-nosym-i386.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-nosym-i386.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rel_iplt_end/__rel_iplt_start
 // appear in symtab if there is no references to them.

Modified: lld/trunk/test/ELF/gnu-ifunc-nosym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-nosym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-nosym.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-nosym.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
-// RUN: llvm-readobj -symbols %tout | FileCheck %s
+// RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 // Check that no __rela_iplt_end/__rela_iplt_start
 // appear in symtab if there is no references to them.

Modified: lld/trunk/test/ELF/gnu-ifunc-plt-i386.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-plt-i386.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-plt-i386.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-plt-i386.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are after the JUMP_SLOT in the plt
 // CHECK: Relocations [

Modified: lld/trunk/test/ELF/gnu-ifunc-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-plt.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-plt.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 // RUN: ld.lld --hash-style=sysv %t.so %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
-// RUN: llvm-readobj -r -dynamic-table %tout | FileCheck %s
+// RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are after the JUMP_SLOT in the plt
 // CHECK: Relocations [

Modified: lld/trunk/test/ELF/gnu-ifunc-relative.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-relative.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-relative.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc-relative.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: ld.lld --strip-all %t.o -o %t
 // RUN: llvm-readobj -r %t | FileCheck %s
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -r -t %t | FileCheck %s --check-prefixes=CHECK,SYM
+// RUN: llvm-readobj -r --symbols %t | FileCheck %s --check-prefixes=CHECK,SYM
 
 .type foo STT_GNU_IFUNC
 .globl foo

Modified: lld/trunk/test/ELF/gnu-ifunc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc.s (original)
+++ lld/trunk/test/ELF/gnu-ifunc.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -static %t.o -o %tout
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DISASM
-// RUN: llvm-readobj -r -symbols -sections %tout | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections %tout | FileCheck %s
 
 // CHECK:      Sections [
 // CHECK:       Section {

Modified: lld/trunk/test/ELF/gnu-unique.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-unique.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnu-unique.s (original)
+++ lld/trunk/test/ELF/gnu-unique.s Tue Apr 30 22:49:01 2019
@@ -2,12 +2,12 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 //
 // RUN: ld.lld %t -shared -o %tout.so
-// RUN: llvm-readobj -dyn-symbols %tout.so | FileCheck -check-prefix=GNU %s
+// RUN: llvm-readobj --dyn-syms %tout.so | FileCheck -check-prefix=GNU %s
 // RUN: ld.lld %t -shared -o %tout.so --gnu-unique
-// RUN: llvm-readobj -dyn-symbols %tout.so | FileCheck -check-prefix=GNU %s
+// RUN: llvm-readobj --dyn-syms %tout.so | FileCheck -check-prefix=GNU %s
 //
 // RUN: ld.lld %t -shared -o %tout.so --no-gnu-unique
-// RUN: llvm-readobj -dyn-symbols %tout.so | FileCheck -check-prefix=NO %s
+// RUN: llvm-readobj --dyn-syms %tout.so | FileCheck -check-prefix=NO %s
 
 // Check that STB_GNU_UNIQUE is treated as a global and ends up in the dynamic
 // symbol table as STB_GNU_UNIQUE.

Modified: lld/trunk/test/ELF/gnustack.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnustack.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gnustack.s (original)
+++ lld/trunk/test/ELF/gnustack.s Tue Apr 30 22:49:01 2019
@@ -2,13 +2,13 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 
 # RUN: ld.lld %t1 -z execstack -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=RWX %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck --check-prefix=RWX %s
 
 # RUN: ld.lld %t1 -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=RW %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck --check-prefix=RW %s
 
 # RUN: ld.lld %t1 -o %t -z noexecstack
-# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=RW %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck --check-prefix=RW %s
 
 # RW:      Type: PT_GNU_STACK
 # RW-NEXT: Offset: 0x0

Modified: lld/trunk/test/ELF/got-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/got-aarch64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/got-aarch64.s (original)
+++ lld/trunk/test/ELF/got-aarch64.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: aarch64
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv -shared %t.o -o %t.so
-// RUN: llvm-readobj -s -r %t.so | FileCheck %s
+// RUN: llvm-readobj -S -r %t.so | FileCheck %s
 // RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .got

Modified: lld/trunk/test/ELF/got-i386.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/got-i386.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/got-i386.s (original)
+++ lld/trunk/test/ELF/got-i386.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s -r -t %t | FileCheck %s
+// RUN: llvm-readobj -S -r --symbols %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .got.plt

Modified: lld/trunk/test/ELF/got-plt-header.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/got-plt-header.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/got-plt-header.s (original)
+++ lld/trunk/test/ELF/got-plt-header.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         call foo at plt
 

Modified: lld/trunk/test/ELF/got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/got.s (original)
+++ lld/trunk/test/ELF/got.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r %t | FileCheck %s
+// RUN: llvm-readobj -S -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .got

Modified: lld/trunk/test/ELF/gotpc-relax-nopic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gotpc-relax-nopic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gotpc-relax-nopic.s (original)
+++ lld/trunk/test/ELF/gotpc-relax-nopic.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -relax-relocations -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv %t.o -o %t1
-# RUN: llvm-readobj -symbols -r %t1 | FileCheck --check-prefix=SYMRELOC %s
+# RUN: llvm-readobj --symbols -r %t1 | FileCheck --check-prefix=SYMRELOC %s
 # RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 ## There is no relocations.
@@ -26,7 +26,7 @@
 # DISASM-NEXT:   201038: {{.*}} testq $2105344, %r15
 
 # RUN: ld.lld --hash-style=sysv -shared %t.o -o %t2
-# RUN: llvm-readobj -s -r -d %t2 | FileCheck --check-prefix=SEC-PIC    %s
+# RUN: llvm-readobj -S -r -d %t2 | FileCheck --check-prefix=SEC-PIC    %s
 # RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM-PIC %s
 # SEC-PIC:      Section {
 # SEC-PIC:        Index:

Modified: lld/trunk/test/ELF/gotpc-relax-und-dso.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gotpc-relax-und-dso.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gotpc-relax-und-dso.s (original)
+++ lld/trunk/test/ELF/gotpc-relax-und-dso.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -relax-relocations -triple=x86_64-pc-linux %S/Inputs/gotpc-relax-und-dso.s -o %tdso.o
 # RUN: ld.lld -shared %tdso.o -o %t.so
 # RUN: ld.lld --hash-style=sysv -shared %t.o %t.so -o %tout
-# RUN: llvm-readobj -r -s %tout | FileCheck --check-prefix=RELOC %s
+# RUN: llvm-readobj -r -S %tout | FileCheck --check-prefix=RELOC %s
 # RUN: llvm-objdump -d %tout | FileCheck --check-prefix=DISASM %s
 
 # RELOC:      Relocations [

Modified: lld/trunk/test/ELF/gotpcrelx.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gotpcrelx.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/gotpcrelx.s (original)
+++ lld/trunk/test/ELF/gotpcrelx.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: %s -o %t.o
 // RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=RELS %s
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -r %t.so | FileCheck %s
+// RUN: llvm-readobj -S -r %t.so | FileCheck %s
 
 movq foo at GOTPCREL(%rip), %rax
 movq bar at GOTPCREL(%rip), %rax

Modified: lld/trunk/test/ELF/i386-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/i386-merge.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/i386-merge.s (original)
+++ lld/trunk/test/ELF/i386-merge.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t -shared
-// RUN: llvm-readobj -s -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 // CHECK:      Name: .mysec
 // CHECK-NEXT: Type:

Modified: lld/trunk/test/ELF/i386-static-tls-model.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/i386-static-tls-model.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/i386-static-tls-model.s (original)
+++ lld/trunk/test/ELF/i386-static-tls-model.s Tue Apr 30 22:49:01 2019
@@ -2,19 +2,19 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model1.s -o %t.o
 # RUN: ld.lld %t.o -o %t1 -shared
-# RUN: llvm-readobj -dynamic-table %t1 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t1 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model2.s -o %t.o
 # RUN: ld.lld %t.o -o %t2 -shared
-# RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model3.s -o %t.o
 # RUN: ld.lld %t.o -o %t3 -shared
-# RUN: llvm-readobj -dynamic-table %t3 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t3 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %S/Inputs/i386-static-tls-model4.s -o %t.o
 # RUN: ld.lld %t.o -o %t4 -shared
-# RUN: llvm-readobj -dynamic-table %t4 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t4 | FileCheck %s
 
 # CHECK: DynamicSection [
 # CHECK: FLAGS STATIC_TLS

Modified: lld/trunk/test/ELF/i386-tls-ie-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/i386-tls-ie-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/i386-tls-ie-shared.s (original)
+++ lld/trunk/test/ELF/i386-tls-ie-shared.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %p/Inputs/tls-opt-iele-i686-nopic.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %tso
 // RUN: ld.lld --hash-style=sysv -shared %t.o %tso -o %t1
-// RUN: llvm-readobj -s -r -d %t1 | FileCheck --check-prefix=GOTRELSHARED %s
+// RUN: llvm-readobj -S -r -d %t1 | FileCheck --check-prefix=GOTRELSHARED %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASMSHARED %s
 
 // GOTRELSHARED:     Section {

Modified: lld/trunk/test/ELF/icf-merged-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/icf-merged-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/icf-merged-sections.s (original)
+++ lld/trunk/test/ELF/icf-merged-sections.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --icf=all --ignore-data-address-equality --print-icf-sections | FileCheck -allow-empty --check-prefix=NOICF %s
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # Check that merge synthetic sections are not merged by ICF.
 

Modified: lld/trunk/test/ELF/image-base.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/image-base.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/image-base.s (original)
+++ lld/trunk/test/ELF/image-base.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld -image-base=0x1000000 %t -o %t1
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 # RUN: not ld.lld -image-base=ABC %t -o %t1 2>&1 | FileCheck --check-prefix=ERR %s
 # ERR: error: -image-base: number expected, but got ABC
@@ -11,7 +11,7 @@
 
 # Check alias.
 # RUN: ld.lld -image-base 0x1000000 %t -o %t1
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/init-fini-progbits.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/init-fini-progbits.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/init-fini-progbits.s (original)
+++ lld/trunk/test/ELF/init-fini-progbits.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t.exe
-// RUN: llvm-readobj -sections %t.exe | FileCheck %s
+// RUN: llvm-readobj --sections %t.exe | FileCheck %s
 
 // CHECK:      Name: .init_array
 // CHECK-NEXT: Type: SHT_INIT_ARRAY

Modified: lld/trunk/test/ELF/init-fini.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/init-fini.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/init-fini.s (original)
+++ lld/trunk/test/ELF/init-fini.s Tue Apr 30 22:49:01 2019
@@ -3,25 +3,25 @@
 
 // Should use "_init" and "_fini" by default when fills dynamic table
 // RUN: ld.lld -shared %t -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=BYDEF %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=BYDEF %s
 // BYDEF: INIT 0x11010
 // BYDEF: FINI 0x11020
 
 // -init and -fini override symbols to use
 // RUN: ld.lld -shared %t -o %t2 -init _foo -fini _bar
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=OVR %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=OVR %s
 // OVR: INIT 0x11030
 // OVR: FINI 0x11040
 
 // Check aliases as well
 // RUN: ld.lld -shared %t -o %t2 -init=_foo -fini=_bar
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=OVR %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=OVR %s
 
 // Don't add an entry for undef. The freebsd dynamic linker doesn't
 // check if the value is null. If it is, it will just call the
 // load address.
 // RUN: ld.lld -shared %t -o %t2 -init=_undef -fini=_undef
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=UNDEF %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=UNDEF %s
 // UNDEF-NOT: INIT
 // UNDEF-NOT: FINI
 
@@ -30,14 +30,14 @@
 // RUN: echo > %t.s
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t2.o
 // RUN: ld.lld -shared %t2.o %t.so -o %t2
-// RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=SHARED %s
+// RUN: llvm-readobj --dynamic-table %t2 | FileCheck --check-prefix=SHARED %s
 // SHARED-NOT: INIT
 // SHARED-NOT: FINI
 
 // Should not add new entries to the symbol table
 // and should not require given symbols to be resolved
 // RUN: ld.lld -shared %t -o %t2 -init=_unknown -fini=_unknown
-// RUN: llvm-readobj -symbols -dynamic-table %t2 | FileCheck --check-prefix=NOENTRY %s
+// RUN: llvm-readobj --symbols --dynamic-table %t2 | FileCheck --check-prefix=NOENTRY %s
 // NOENTRY: Symbols [
 // NOENTRY-NOT: Name: _unknown
 // NOENTRY: ]

Modified: lld/trunk/test/ELF/linkerscript/absolute-expr.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/absolute-expr.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/absolute-expr.test (original)
+++ lld/trunk/test/ELF/linkerscript/absolute-expr.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: echo ".global foo; foo = 0x123" | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t.o
 # RUN: ld.lld -o %t.so --script %s %t.o -shared
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 SECTIONS {
   .text : {

Modified: lld/trunk/test/ELF/linkerscript/alternate-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/alternate-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/alternate-sections.s (original)
+++ lld/trunk/test/ELF/linkerscript/alternate-sections.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { abc : { *(foo) *(bar) *(zed) } }" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o -shared
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:       Section {
 # CHECK:        Index:

Modified: lld/trunk/test/ELF/linkerscript/arm-exidx-order.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/arm-exidx-order.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/arm-exidx-order.test (original)
+++ lld/trunk/test/ELF/linkerscript/arm-exidx-order.test Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: echo ".fnstart; .cantunwind; .fnend" \
 # RUN:   | llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi - -o %t.o
 # RUN: ld.lld -T %s %t.o -shared -o %t.so
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;

Modified: lld/trunk/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s (original)
+++ lld/trunk/test/ELF/linkerscript/arm-exidx-sentinel-and-assignment.s Tue Apr 30 22:49:01 2019
@@ -8,7 +8,7 @@
 ## was anything but an input section description.
 # RUN: ld.lld --no-merge-exidx-entries -T %t.script %t.o -shared -o %t.so
 # RUN: llvm-objdump -s -triple=armv7a-none-linux-gnueabi %t.so | FileCheck %s
-# RUN: llvm-readobj -s -t %t.so | FileCheck %s --check-prefix=SYMBOL
+# RUN: llvm-readobj -S --symbols %t.so | FileCheck %s --check-prefix=SYMBOL
 
  .syntax unified
  .text

Modified: lld/trunk/test/ELF/linkerscript/at-addr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/at-addr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/at-addr.s (original)
+++ lld/trunk/test/ELF/linkerscript/at-addr.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN:  .ccc : AT(ADDR(.ccc) - 0x500) { *(.ccc) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      Type: PT_LOAD
 # CHECK-NEXT:   Offset: 0x1000

Modified: lld/trunk/test/ELF/linkerscript/at-self-reference.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/at-self-reference.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/at-self-reference.s (original)
+++ lld/trunk/test/ELF/linkerscript/at-self-reference.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN:  .bbb : AT(ADDR(.bbb)) { *(.bbb) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      ProgramHeaders [
 # CHECK-NEXT:  ProgramHeader {

Modified: lld/trunk/test/ELF/linkerscript/at.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/at.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/at.s (original)
+++ lld/trunk/test/ELF/linkerscript/at.s Tue Apr 30 22:49:01 2019
@@ -9,7 +9,7 @@
 # RUN:  .eee 0x5000 : AT(0x5000) { *(.eee) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      ProgramHeaders [
 # CHECK-NEXT:   ProgramHeader {

Modified: lld/trunk/test/ELF/linkerscript/at2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/at2.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/at2.test (original)
+++ lld/trunk/test/ELF/linkerscript/at2.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/at2.s -o %t.o
 # RUN: ld.lld -o %t.exe %t.o --script %s
-# RUN: llvm-readobj -program-headers %t.exe | FileCheck %s
+# RUN: llvm-readobj -l %t.exe | FileCheck %s
 # RUN: llvm-objdump -section-headers %t.exe | FileCheck %s --check-prefix=SECTIONS
 
 MEMORY {

Modified: lld/trunk/test/ELF/linkerscript/at4.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/at4.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/at4.s (original)
+++ lld/trunk/test/ELF/linkerscript/at4.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:  .ccc : { *(.ccc) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:        Type: PT_LOAD
 # CHECK-NEXT:     Offset: 0x1000

Modified: lld/trunk/test/ELF/linkerscript/comdat-gc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/comdat-gc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/comdat-gc.s (original)
+++ lld/trunk/test/ELF/linkerscript/comdat-gc.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/comdat-gc.s -o %t1
 # RUN: echo "SECTIONS { .text : { *(.text*) } }" > %t.script
 # RUN: ld.lld --gc-sections --script %t.script %t %t1 -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck -check-prefix=GC1 %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck -check-prefix=GC1 %s
 
 # GC1:     Name: .debug_line
 

Modified: lld/trunk/test/ELF/linkerscript/common-assign.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/common-assign.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/common-assign.s (original)
+++ lld/trunk/test/ELF/linkerscript/common-assign.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: echo "SECTIONS { . = SIZEOF_HEADERS; pfoo = foo; pbar = bar; }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -symbols %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK:       Symbol {
 # CHECK:         Name: bar

Modified: lld/trunk/test/ELF/linkerscript/common-exclude.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/common-exclude.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/common-exclude.s (original)
+++ lld/trunk/test/ELF/linkerscript/common-exclude.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/common-filespec2.s -o %tfile2.o
 # RUN: echo "SECTIONS { .common.incl : { *(EXCLUDE_FILE (*file2.o) COMMON) } .common.excl : { *(COMMON) } }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %tfile0.o %tfile1.o %tfile2.o
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 # Commons from file0 and file1 are not excluded, so they must be in .common.incl
 # Commons from file2 are excluded from the first rule and should be caught by

Modified: lld/trunk/test/ELF/linkerscript/common-filespec.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/common-filespec.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/common-filespec.test (original)
+++ lld/trunk/test/ELF/linkerscript/common-filespec.test Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/common-filespec1.s -o %tfile1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/common-filespec2.s -o %tfile2.o
 # RUN: ld.lld -o %t1 --script %s %tfile0.o %tfile1.o %tfile2.o
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 SECTIONS {
   .common_0 : { *file0.o(COMMON) }

Modified: lld/trunk/test/ELF/linkerscript/common.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/common.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/common.s (original)
+++ lld/trunk/test/ELF/linkerscript/common.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: echo "SECTIONS { . = SIZEOF_HEADERS; .common : { *(COMMON) } }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 # CHECK:       Section {
 # CHECK:         Index:

Modified: lld/trunk/test/ELF/linkerscript/compress-debug-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/compress-debug-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/compress-debug-sections.s (original)
+++ lld/trunk/test/ELF/linkerscript/compress-debug-sections.s Tue Apr 30 22:49:01 2019
@@ -11,12 +11,12 @@
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld -O0 %t1.o %t2.o %t.script -o %t1 --compress-debug-sections=zlib
 # RUN: llvm-dwarfdump -a %t1 | FileCheck %s
-# RUN: llvm-readobj -s %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
 
 # RUN: echo "SECTIONS { .debug_str 0 : { *(.debug_str) } }" > %t2.script
 # RUN: ld.lld -O0 %t1.o %t2.o %t2.script -o %t2 --compress-debug-sections=zlib
 # RUN: llvm-dwarfdump -a %t2 | FileCheck %s
-# RUN: llvm-readobj -s %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
+# RUN: llvm-readobj -S %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
 
 # CHECK:       .debug_str contents:
 # CHECK-NEXT:    CCC

Modified: lld/trunk/test/ELF/linkerscript/copy-rel-symbol-value.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/copy-rel-symbol-value.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/copy-rel-symbol-value.s (original)
+++ lld/trunk/test/ELF/linkerscript/copy-rel-symbol-value.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: ld.lld %t2.o -o %t2.so -shared
 # RUN: echo "SECTIONS { . = . + SIZEOF_HEADERS; foo = bar; }" > %t.script
 # RUN: ld.lld %t.o %t2.so --script %t.script -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 
 # CHECK:      Name: bar
 # CHECK-NEXT: Value: 0x[[VAL:.*]]

Modified: lld/trunk/test/ELF/linkerscript/data-segment-relro.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/data-segment-relro.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/data-segment-relro.test (original)
+++ lld/trunk/test/ELF/linkerscript/data-segment-relro.test Tue Apr 30 22:49:01 2019
@@ -7,10 +7,10 @@
 ## page boundary.
 
 # RUN: ld.lld --hash-style=sysv -z norelro %t1.o %t2.so --script %s -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # RUN: ld.lld --hash-style=sysv -z relro %t1.o %t2.so --script %s -o %t2
-# RUN: llvm-readobj -s %t2 | FileCheck %s
+# RUN: llvm-readobj -S %t2 | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;

Modified: lld/trunk/test/ELF/linkerscript/debuginfo-gc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/debuginfo-gc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/debuginfo-gc.s (original)
+++ lld/trunk/test/ELF/linkerscript/debuginfo-gc.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/comdat-gc.s -o %t1
 # RUN: echo "SECTIONS { .text : { *(.text*) } }" > %t.script
 # RUN: ld.lld --gc-sections --script %t.script %t %t1 -o %t2
-# RUN: llvm-readobj -sections -symbols %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --symbols %t2 | FileCheck %s
 
 # CHECK-NOT: Name: .debug_line
 

Modified: lld/trunk/test/ELF/linkerscript/defsym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/defsym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/defsym.s (original)
+++ lld/trunk/test/ELF/linkerscript/defsym.s Tue Apr 30 22:49:01 2019
@@ -7,13 +7,13 @@
 
 ## Check that linker script can override -defsym assignments.
 # RUN: ld.lld %t.o -defsym=foo=0x11 -script %t.script -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:      Name: foo
 # CHECK-NEXT:   Value: 0x22
 
 ## Check that -defsym can override linker script. Check that multiple
 ## -defsym commands for the same symbol are allowed.
 # RUN: ld.lld %t.o -script %t.script -defsym=foo=0x11 -defsym=foo=0x33 -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s --check-prefix=REORDER
+# RUN: llvm-readobj --symbols %t | FileCheck %s --check-prefix=REORDER
 # REORDER:      Name: foo
 # REORDER-NEXT:   Value: 0x33

Modified: lld/trunk/test/ELF/linkerscript/discard-interp.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/discard-interp.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/discard-interp.test (original)
+++ lld/trunk/test/ELF/linkerscript/discard-interp.test Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/../Inputs/shared.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: ld.lld -dynamic-linker foo -rpath bar -rpath baz --script %s --export-dynamic %t.o %t2.so -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK-NOT:        Name: .interp
 

Modified: lld/trunk/test/ELF/linkerscript/dot-is-not-abs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/dot-is-not-abs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/dot-is-not-abs.s (original)
+++ lld/trunk/test/ELF/linkerscript/dot-is-not-abs.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: echo "SECTIONS { .text : { *(.text) } foo = .; .bar : { *(.bar) } }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t.o -shared
-# RUN: llvm-readobj -t -s -section-data %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols -S --section-data %t1 | FileCheck %s
 
 .hidden foo
 .long foo - .

Modified: lld/trunk/test/ELF/linkerscript/dynamic-sym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/dynamic-sym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/dynamic-sym.s (original)
+++ lld/trunk/test/ELF/linkerscript/dynamic-sym.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "_DYNAMIC = 0x123;" > %t.script
 # RUN: ld.lld -T %t.script %t.o -shared -o %t.so
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: _DYNAMIC

Modified: lld/trunk/test/ELF/linkerscript/dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/dynamic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/dynamic.s (original)
+++ lld/trunk/test/ELF/linkerscript/dynamic.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld %t1.o %t2.so -o %t
-# RUN: llvm-readobj -dynamic-table %t | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t | FileCheck %s
 
 # CHECK:      DynamicSection [
 # CHECK-NEXT:  Tag                 Type             Name/Value

Modified: lld/trunk/test/ELF/linkerscript/eh-frame-merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/eh-frame-merge.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/eh-frame-merge.s (original)
+++ lld/trunk/test/ELF/linkerscript/eh-frame-merge.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { .eh_frame_hdr : { *(.eh_frame_hdr) *(.eh_frame) } }" > %t.script
 # RUN: ld.lld -o %t --no-threads --eh-frame-hdr --script %t.script %t.o
-# RUN: llvm-readobj -s -u %t | FileCheck %s
+# RUN: llvm-readobj -S -u %t | FileCheck %s
 
 # CHECK: Name: .dah
 # CHECK-NOT: Section

Modified: lld/trunk/test/ELF/linkerscript/ehdr_start.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/ehdr_start.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/ehdr_start.s (original)
+++ lld/trunk/test/ELF/linkerscript/ehdr_start.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld %t.o -script %t.script -o %t
-# RUN: llvm-readobj -symbols %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 # CHECK:    Name: __ehdr_start (1)
 # CHECK-NEXT:    Value: 0x0
 # CHECK-NEXT:    Size: 0

Modified: lld/trunk/test/ELF/linkerscript/empty-link-order.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/empty-link-order.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/empty-link-order.test (original)
+++ lld/trunk/test/ELF/linkerscript/empty-link-order.test Tue Apr 30 22:49:01 2019
@@ -11,7 +11,7 @@ SECTIONS {
 # RUN: ld.lld %t.o -o %t --script %s
 
 ## Check we do not crash and do not set SHF_LINK_ORDER flag for .foo
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 # CHECK:      Section {
 # CHECK:       Index:
 # CHECK:       Name: .foo

Modified: lld/trunk/test/ELF/linkerscript/empty-section-size.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/empty-section-size.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/empty-section-size.test (original)
+++ lld/trunk/test/ELF/linkerscript/empty-section-size.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t.o
 # RUN: ld.lld %t.o --script %s -o %t1
-# RUN: llvm-readobj -symbols %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 ## We had a bug when LLD increased the size of the output section even
 ## if it was empty. That happened because of empty synthetic sections included.

Modified: lld/trunk/test/ELF/linkerscript/empty-synthetic-removed-flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/empty-synthetic-removed-flags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/empty-synthetic-removed-flags.s (original)
+++ lld/trunk/test/ELF/linkerscript/empty-synthetic-removed-flags.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { .foo : { *(.foo) } .bar : { *(.got.plt) BYTE(0x11) }}" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 ## We have ".got.plt" synthetic section with SHF_ALLOC|SHF_WRITE flags.
 ## It is empty, so linker removes it, but it has to keep ".got.plt" output
@@ -21,7 +21,7 @@
 ## Check flags are not the same if we omit empty synthetic section in script.
 # RUN: echo "SECTIONS { .foo : { *(.foo) } .bar : { BYTE(0x11) }}" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -s %t | FileCheck --check-prefix=EMPTY %s
+# RUN: llvm-readobj -S %t | FileCheck --check-prefix=EMPTY %s
 
 # EMPTY:     Section {
 # EMPTY:       Index: 2

Modified: lld/trunk/test/ELF/linkerscript/entry.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/entry.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/entry.s (original)
+++ lld/trunk/test/ELF/linkerscript/entry.s Tue Apr 30 22:49:01 2019
@@ -14,7 +14,7 @@
 # -e has precedence over linker script's ENTRY.
 # RUN: echo "ENTRY(_label)" > %t.script
 # RUN: ld.lld -e _start -o %t2 %t.script %t
-# RUN: llvm-readobj -file-headers -symbols %t2 | \
+# RUN: llvm-readobj --file-headers --symbols %t2 | \
 # RUN:   FileCheck -check-prefix=OVERLOAD %s
 
 # OVERLOAD: Entry: [[ENTRY:0x[0-9A-F]+]]
@@ -24,7 +24,7 @@
 # The entry symbol can be a linker-script-defined symbol.
 # RUN: echo "ENTRY(foo); foo = 1;" > %t.script
 # RUN: ld.lld -o %t2 %t.script %t
-# RUN: llvm-readobj -file-headers -symbols %t2 | \
+# RUN: llvm-readobj --file-headers --symbols %t2 | \
 # RUN:   FileCheck -check-prefix=SCRIPT %s
 
 # SCRIPT: Entry: 0x1

Modified: lld/trunk/test/ELF/linkerscript/extend-pt-load1.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/extend-pt-load1.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/extend-pt-load1.test (original)
+++ lld/trunk/test/ELF/linkerscript/extend-pt-load1.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/extend-pt-load.s -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t1 --script %s %t.o -shared
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t1 | FileCheck %s
+# RUN: llvm-readobj --elf-output-style=GNU -l -S %t1 | FileCheck %s
 
 # This test demonstrates an odd consequence of the way we handle sections with just symbol
 # assignments.

Modified: lld/trunk/test/ELF/linkerscript/extend-pt-load2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/extend-pt-load2.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/extend-pt-load2.test (original)
+++ lld/trunk/test/ELF/linkerscript/extend-pt-load2.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/extend-pt-load.s -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t2 --script %s %t.o -shared
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t2 | FileCheck %s
+# RUN: llvm-readobj --elf-output-style=GNU -l -S %t2 | FileCheck %s
 
 # Then add the section bar. Note how bar is given AX flags, which causes the PT_LOAD to now
 # cover the padding bits created by ALIGN.

Modified: lld/trunk/test/ELF/linkerscript/extend-pt-load3.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/extend-pt-load3.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/extend-pt-load3.test (original)
+++ lld/trunk/test/ELF/linkerscript/extend-pt-load3.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/extend-pt-load.s -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t3 --script %s %t.o -shared
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t3 | FileCheck --check-prefix=CHECK %s
+# RUN: llvm-readobj --elf-output-style=GNU -l -S %t3 | FileCheck --check-prefix=CHECK %s
 
 # If the current behavior becomes a problem we should consider just moving the commands out
 # of the section. That is, handle the above like the following test.

Modified: lld/trunk/test/ELF/linkerscript/header-addr.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/header-addr.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/header-addr.test (original)
+++ lld/trunk/test/ELF/linkerscript/header-addr.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux /dev/null -o %t.o
 # RUN: ld.lld --hash-style=sysv -o %t.so --script %s %t.o -shared
-# RUN: llvm-readobj -program-headers %t.so | FileCheck %s
+# RUN: llvm-readobj -l %t.so | FileCheck %s
 
 PHDRS { all PT_LOAD PHDRS; }
 
@@ -28,7 +28,7 @@ SECTIONS {
 # CHECK-NEXT: ]
 
 # RUN: ld.lld --hash-style=sysv -o %t2.so --script %s %t.o -shared -z max-page-size=0x2000
-# RUN: llvm-readobj -program-headers %t2.so \
+# RUN: llvm-readobj -l %t2.so \
 # RUN:   | FileCheck --check-prefix=MAXPAGE %s
 
 # MAXPAGE:      ProgramHeaders [

Modified: lld/trunk/test/ELF/linkerscript/info-section-type.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/info-section-type.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/info-section-type.s (original)
+++ lld/trunk/test/ELF/linkerscript/info-section-type.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 
 # RUN: echo "SECTIONS { .bar : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=DEFAULT
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=DEFAULT
 # DEFAULT:      Name: .bar
 # DEFAULT:      Type: SHT_PROGBITS
 # DEFAULT-NEXT: Flags [
@@ -15,7 +15,7 @@
 
 # RUN: echo "SECTIONS { .bar (COPY) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 # NONALLOC:      Name: .bar
 # NONALLOC:      Type: SHT_PROGBITS
 # NONALLOC-NEXT: Flags [
@@ -23,19 +23,19 @@
 
 # RUN: echo "SECTIONS { .bar (INFO) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 
 # RUN: echo "SECTIONS { .bar (OVERLAY) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 
 # RUN: echo "SECTIONS { .bar (INFO) : { . += 1; } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 
 # RUN: echo "SECTIONS { .bar 0x20000 (INFO) : { *(.foo) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=NONALLOC
+# RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix=NONALLOC
 
 # RUN: echo "SECTIONS { .bar 0x20000 (BAR) : { *(.foo) } };" > %t.script
 # RUN: not ld.lld -o %t --script %t.script %t.o 2>&1 |\

Modified: lld/trunk/test/ELF/linkerscript/lazy-symbols.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/lazy-symbols.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/lazy-symbols.test (original)
+++ lld/trunk/test/ELF/linkerscript/lazy-symbols.test Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-ar rcs %tar %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t2
 # RUN: ld.lld %t2 %tar --script %s -o %tout
-# RUN: llvm-readobj -symbols %tout | FileCheck %s
+# RUN: llvm-readobj --symbols %tout | FileCheck %s
 
 foo = 1;
 

Modified: lld/trunk/test/ELF/linkerscript/memory-at.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/memory-at.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/memory-at.test (original)
+++ lld/trunk/test/ELF/linkerscript/memory-at.test Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: echo '.section .data,"aw"; .quad 0' >> %t.s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t
 # RUN: ld.lld %t --script %s -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 MEMORY {
   FLASH (rx) : ORIGIN = 0x1000, LENGTH = 0x100

Modified: lld/trunk/test/ELF/linkerscript/memory-region-alignment.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/memory-region-alignment.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/memory-region-alignment.test (original)
+++ lld/trunk/test/ELF/linkerscript/memory-region-alignment.test Tue Apr 30 22:49:01 2019
@@ -17,7 +17,7 @@ SECTIONS {
 }
 
 # RUN: ld.lld %t.o -o %t --script %s
-# RUN: llvm-readobj -sections %t | FileCheck %s
+# RUN: llvm-readobj --sections %t | FileCheck %s
 
 # CHECK:        Name: .foo
 # CHECK-NEXT:   Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/linkerscript/merge-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/merge-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/merge-sections.s (original)
+++ lld/trunk/test/ELF/linkerscript/merge-sections.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN:   .foo : { begin = .; *(.foo.*) end = .;} \
 # RUN: }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t -shared
-# RUN: llvm-readobj -s -t %t1 | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t1 | FileCheck %s
 
 # CHECK:        Name: .foo
 # CHECK-NEXT:   Type: SHT_PROGBITS
@@ -32,7 +32,7 @@
 
 # Check that we don't crash with --gc-sections
 # RUN: ld.lld --gc-sections -o %t2 --script %t.script %t -shared
-# RUN: llvm-readobj -s -t %t2 | FileCheck %s --check-prefix=GC
+# RUN: llvm-readobj -S --symbols %t2 | FileCheck %s --check-prefix=GC
 
 # GC:        Name: .foo
 # GC-NEXT:   Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/linkerscript/multiple-tbss.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/multiple-tbss.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/multiple-tbss.s (original)
+++ lld/trunk/test/ELF/linkerscript/multiple-tbss.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t
-# RUN: llvm-readobj -l -s %t | FileCheck %s
+# RUN: llvm-readobj -l -S %t | FileCheck %s
 
 # CHECK:        Name: .tbss
 # CHECK-NEXT:   Type: SHT_NOBITS

Modified: lld/trunk/test/ELF/linkerscript/noload.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/noload.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/noload.s (original)
+++ lld/trunk/test/ELF/linkerscript/noload.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN:        .data_noload_b (0x10000) (NOLOAD) : { *(.data_noload_b) } \
 # RUN:        .text (0x20000) : { *(.text) } };" > %t.script
 # RUN: ld.lld -o %t --script %t.script %t.o
-# RUN: llvm-readobj -sections -program-headers  %t | FileCheck %s
+# RUN: llvm-readobj --sections -l  %t | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index: 1

Modified: lld/trunk/test/ELF/linkerscript/non-absolute.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/non-absolute.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/non-absolute.s (original)
+++ lld/trunk/test/ELF/linkerscript/non-absolute.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: echo "SECTIONS { A = . - 0x10; B = A + 0x1; }" > %t.script
 # RUN: ld.lld -shared %t1.o --script %t.script -o %t
 # RUN: llvm-objdump -d %t | FileCheck %s --check-prefix=DUMP
-# RUN: llvm-readobj -t %t | FileCheck %s --check-prefix=SYMBOL
+# RUN: llvm-readobj --symbols %t | FileCheck %s --check-prefix=SYMBOL
 
 # B = A + 0x1 = -0x10 + 0x1 = -0xf -> 0xFFFFFFFFFFFFFFF1
 # B - (0x94+6) = -0xf - (0x94+6) = -169

Modified: lld/trunk/test/ELF/linkerscript/obj-symbol-value.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/obj-symbol-value.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/obj-symbol-value.s (original)
+++ lld/trunk/test/ELF/linkerscript/obj-symbol-value.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { foo = bar; .bar : { *(.bar*) } }" > %t.script
 # RUN: ld.lld %t.o --script %t.script -o %t.so -shared
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 # CHECK:     Symbol {
 # CHECK:      Name: bar

Modified: lld/trunk/test/ELF/linkerscript/openbsd-bootdata.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/openbsd-bootdata.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/openbsd-bootdata.test (original)
+++ lld/trunk/test/ELF/linkerscript/openbsd-bootdata.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux /dev/null -o %t.o
 # RUN: ld.lld --script %s %t.o -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck %s
 
 PHDRS { boot PT_OPENBSD_BOOTDATA; }
 

Modified: lld/trunk/test/ELF/linkerscript/openbsd-randomize.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/openbsd-randomize.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/openbsd-randomize.s (original)
+++ lld/trunk/test/ELF/linkerscript/openbsd-randomize.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN:         .text : { *(.text) } \
 # RUN:         .openbsd.randomdata : { *(.openbsd.randomdata) } : rand }" > %t.script
 # RUN: ld.lld --script %t.script %t.o -o %t
-# RUN: llvm-readobj --program-headers -s %t | FileCheck %s
+# RUN: llvm-readobj --program-headers -S %t | FileCheck %s
 
 # CHECK:      ProgramHeader {
 # CHECK:        Type: PT_OPENBSD_RANDOMIZE (0x65A3DBE6)

Modified: lld/trunk/test/ELF/linkerscript/orphan-first-cmd.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/orphan-first-cmd.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/orphan-first-cmd.test (original)
+++ lld/trunk/test/ELF/linkerscript/orphan-first-cmd.test Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: echo '.section .bar, "aw"' \
 # RUN:   | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o
 # RUN: ld.lld -o %t -T %s %t.o -shared
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 SECTIONS {
   foo = 123;

Modified: lld/trunk/test/ELF/linkerscript/outsections-addr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/outsections-addr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/outsections-addr.s (original)
+++ lld/trunk/test/ELF/linkerscript/outsections-addr.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:   .ddd 0x5001 : { *(.ddd) } \
 # RUN: }" > %t.script
 # RUN: ld.lld %t --script %t.script -o %tout
-# RUN: llvm-readobj -s %tout | FileCheck %s
+# RUN: llvm-readobj -S %tout | FileCheck %s
 
 ## Check:
 ## 1) Simple constant as address.

Modified: lld/trunk/test/ELF/linkerscript/overlapping-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/overlapping-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/overlapping-sections.s (original)
+++ lld/trunk/test/ELF/linkerscript/overlapping-sections.s Tue Apr 30 22:49:01 2019
@@ -17,7 +17,7 @@
 
 # Verify that the .sec2 was indeed placed in a PT_LOAD where the PhysAddr
 # overlaps with where .sec1 is loaded:
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-LMA
+# RUN: llvm-readobj --sections -l --elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-LMA
 # BAD-LMA-LABEL: Section Headers:
 # BAD-LMA: .sec1             PROGBITS        0000000000008000 002000 000100 00  WA  0   0  1
 # BAD-LMA: .sec2             PROGBITS        0000000000008800 002800 000100 00  WA  0   0  1
@@ -43,7 +43,7 @@
 
 # Check that the expected binary was created with --noinhibit-exec:
 # RUN: ld.lld -o %t.so --script %t-vaddr.script %t.o -shared --noinhibit-exec
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-VADDR
+# RUN: llvm-readobj --sections -l --elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-VADDR
 # BAD-VADDR-LABEL: Section Headers:
 # BAD-VADDR: .sec1             PROGBITS        0000000000008000 002000 000100 00  WA  0   0  1
 # BAD-VADDR: .sec2             PROGBITS        0000000000008020 003020 000100 00  WA  0   0  1
@@ -91,7 +91,7 @@
 # Starting here the contents of .sec2 overwrites .sec1:
 # BROKEN-OUTPUT-FILE-NEXT: 8040 02020202 02020202 02020202 02020202
 
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-BOTH
+# RUN: llvm-readobj --sections -l --elf-output-style=GNU %t.so | FileCheck %s -check-prefix BAD-BOTH
 # BAD-BOTH-LABEL: Section Headers:
 # BAD-BOTH: .sec1             PROGBITS        0000000000008000 002000 000100 00  WA  0   0  1
 # BAD-BOTH: .sec2             PROGBITS        0000000000008040 002040 000100 00  WA  0   0  1

Modified: lld/trunk/test/ELF/linkerscript/overlay.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/overlay.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/overlay.test (original)
+++ lld/trunk/test/ELF/linkerscript/overlay.test Tue Apr 30 22:49:01 2019
@@ -16,7 +16,7 @@ SECTIONS {
 ## .text does not cause overlapping error and that
 ## .text's VA is 0x1000 + max(sizeof(.out.big), sizeof(.out.small)).
 
-# RUN: llvm-readobj -sections -program-headers -elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readobj --sections -l --elf-output-style=GNU %t | FileCheck %s
 
 # CHECK: Section Headers:
 # CHECK: Name       Type     Address          Off    Size

Modified: lld/trunk/test/ELF/linkerscript/page-size-align.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/page-size-align.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/page-size-align.test (original)
+++ lld/trunk/test/ELF/linkerscript/page-size-align.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux /dev/null -o %t.o
 # RUN: ld.lld -T %s -z max-page-size=0x4000 %t.o -o %t.so -shared
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;

Modified: lld/trunk/test/ELF/linkerscript/page-size.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/page-size.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/page-size.s (original)
+++ lld/trunk/test/ELF/linkerscript/page-size.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 # RUN: ld.lld -z max-page-size=0x4000 %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj -l %t2 | FileCheck %s
 
 # CHECK:      ProgramHeaders [
 # CHECK:        ProgramHeader {

Modified: lld/trunk/test/ELF/linkerscript/phdr-check.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/phdr-check.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/phdr-check.s (original)
+++ lld/trunk/test/ELF/linkerscript/phdr-check.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: echo "SECTIONS { . = 0x10000000 + SIZEOF_HEADERS; .text : {*(.text.*)} }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 # CHECK:      ProgramHeaders [
 # CHECK-NEXT:  ProgramHeader {
 # CHECK-NEXT:    Type: PT_PHDR (0x6)

Modified: lld/trunk/test/ELF/linkerscript/phdrs-flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/phdrs-flags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/phdrs-flags.s (original)
+++ lld/trunk/test/ELF/linkerscript/phdrs-flags.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:           .data : {*(.data.*)} :all}" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 # RUN: echo "PHDRS {all PT_LOAD FILEHDR PHDRS FLAGS (0x1);} \
 # RUN:       SECTIONS { \
@@ -16,7 +16,7 @@
 # RUN:           .foo : {*(.foo.*)}  \
 # RUN:           .data : {*(.data.*)} }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=DEFHDR %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=DEFHDR %s
 
 # CHECK:     ProgramHeaders [
 # CHECK-NEXT:  ProgramHeader {

Modified: lld/trunk/test/ELF/linkerscript/phdrs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/phdrs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/phdrs.s (original)
+++ lld/trunk/test/ELF/linkerscript/phdrs.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:           .data : {*(.data.*)} :all}" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 
 ## Check that program headers are not written, unless we explicitly tell
 ## lld to do this.
@@ -18,7 +18,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:       }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=NOPHDR %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=NOPHDR %s
 
 ## Check the AT(expr)
 # RUN: echo "PHDRS {all PT_LOAD FILEHDR PHDRS AT(0x500 + 0x500) ;} \
@@ -28,7 +28,7 @@
 # RUN:           .foo : {*(.foo.*)} :all \
 # RUN:           .data : {*(.data.*)} :all}" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=AT %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=AT %s
 
 # RUN: echo "PHDRS {all PT_LOAD FILEHDR PHDRS ;} \
 # RUN:       SECTIONS { \
@@ -37,7 +37,7 @@
 # RUN:           .foo : {*(.foo.*)}  \
 # RUN:           .data : {*(.data.*)} }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -program-headers %t1 | FileCheck --check-prefix=DEFHDR %s
+# RUN: llvm-readobj -l %t1 | FileCheck --check-prefix=DEFHDR %s
 
 ## Check that error is reported when trying to use phdr which is not listed
 ## inside PHDRS {} block
@@ -95,7 +95,7 @@
 # RUN: echo "PHDRS {text PT_LOAD FILEHDR PHDRS; foo 0x11223344; } \
 # RUN:       SECTIONS { . = SIZEOF_HEADERS; .foo : { *(.foo* .text*) } : text : foo}" > %t1.script
 # RUN: ld.lld -o %t2 --script %t1.script %t
-# RUN: llvm-readobj -program-headers %t2 | FileCheck --check-prefix=INT-PHDRS %s
+# RUN: llvm-readobj -l %t2 | FileCheck --check-prefix=INT-PHDRS %s
 
 # INT-PHDRS:      ProgramHeaders [
 # INT-PHDRS:        ProgramHeader {

Modified: lld/trunk/test/ELF/linkerscript/provide-empty-section.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/provide-empty-section.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/provide-empty-section.s (original)
+++ lld/trunk/test/ELF/linkerscript/provide-empty-section.s Tue Apr 30 22:49:01 2019
@@ -8,19 +8,19 @@
 
 # Case 1: Provided symbol is undefined and not referenced - empty section should be removed.
 # RUN: ld.lld %tundefined.o -T %t.script -o %t1.elf
-# RUN: llvm-readobj -sections %t1.elf | FileCheck %s --check-prefix=NOSECTION
+# RUN: llvm-readobj --sections %t1.elf | FileCheck %s --check-prefix=NOSECTION
 
 # Case 2: Provided symbol is undefined and referenced - empty section should not be removed.
 # RUN: ld.lld %tundefined.o %treference.o -T %t.script -o %t2.elf
-# RUN: llvm-readobj -sections %t2.elf | FileCheck %s --check-prefix=SECTION
+# RUN: llvm-readobj --sections %t2.elf | FileCheck %s --check-prefix=SECTION
 
 # Case 3: Provided symbol is defined and not referenced - empty section should be removed.
 # RUN: ld.lld %tdefined.o -T %t.script -o %t3.elf
-# RUN: llvm-readobj -sections %t3.elf | FileCheck %s --check-prefix=NOSECTION
+# RUN: llvm-readobj --sections %t3.elf | FileCheck %s --check-prefix=NOSECTION
 
 # Case 4: Provided symbol is defined and referenced - empty section should not be removed.
 # RUN: ld.lld %tdefined.o %treference.o -T %t.script -o %t4.elf
-# RUN: llvm-readobj -sections %t4.elf | FileCheck %s --check-prefix=SECTION
+# RUN: llvm-readobj --sections %t4.elf | FileCheck %s --check-prefix=SECTION
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/linkerscript/pt-interp.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/pt-interp.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/pt-interp.test (original)
+++ lld/trunk/test/ELF/linkerscript/pt-interp.test Tue Apr 30 22:49:01 2019
@@ -5,17 +5,17 @@
 ## Check we create PT_INTERP program header when it is specified in PHDRS.
 # RUN: echo "PHDRS { interp PT_INTERP; }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t.o %t.so --dynamic-linker foo
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s
 # CHECK: PT_INTERP
 
 ## Check we do not create it if it is not specified,
 ## but only if PHDRS is not empty by itself.
 # RUN: echo "PHDRS { ph_text PT_LOAD; }" > %t2.script
 # RUN: ld.lld -o %t1 --script %t2.script %t.o %t.so --dynamic-linker foo
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s --check-prefix=NOINTERP
+# RUN: llvm-readobj -l %t1 | FileCheck %s --check-prefix=NOINTERP
 # NOINTERP-NOT: PT_INTERP
 
 ## Otherwise, if PHDRS is empty, we create PT_INTERP header.
 # RUN: echo "PHDRS {}" > %t3.script
 # RUN: ld.lld -o %t1 --script %t3.script %t.o %t.so --dynamic-linker foo
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+# RUN: llvm-readobj -l %t1 | FileCheck %s

Modified: lld/trunk/test/ELF/linkerscript/relocatable-discard.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/relocatable-discard.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/relocatable-discard.s (original)
+++ lld/trunk/test/ELF/linkerscript/relocatable-discard.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { /DISCARD/ : { *(.discard.*) }}" > %t.script
 # RUN: ld.lld -o %t --script %t.script -r %t.o
-# RUN: llvm-readobj -sections %t | FileCheck %s
+# RUN: llvm-readobj --sections %t | FileCheck %s
 
 ## Test shows that we do not crash after discarding the .discard.foo with -r.
 ## Previously it happened because of 2 reasons:

Modified: lld/trunk/test/ELF/linkerscript/repsection-symbol.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/repsection-symbol.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/repsection-symbol.s (original)
+++ lld/trunk/test/ELF/linkerscript/repsection-symbol.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:   .foo : {foo1 = .;  *(.foo.*) foo2 = .;  *(.bar) foo3 = .;} \
 # RUN: }" > %t.script
 # RUN: ld.lld --hash-style=sysv -o %t1 --script %t.script %t -shared
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK:      Name: foo1
 # CHECK-NEXT: Value: 0x2C0

Modified: lld/trunk/test/ELF/linkerscript/section-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/section-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/section-align.s (original)
+++ lld/trunk/test/ELF/linkerscript/section-align.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:   .ccc : ALIGN(4096 * 8) { *(.ccc) } \
 # RUN: }" > %t.script
 # RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-readobj -sections %t1 | FileCheck %s
+# RUN: llvm-readobj --sections %t1 | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/linkerscript/sections-constraint2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/sections-constraint2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/sections-constraint2.s (original)
+++ lld/trunk/test/ELF/linkerscript/sections-constraint2.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { zed : ONLY_IF_RO { *(foo) *(bar) } }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t.so -shared
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
 # CHECK: Sections [
 # CHECK-NOT: zed

Modified: lld/trunk/test/ELF/linkerscript/sections-constraint3.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/sections-constraint3.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/sections-constraint3.s (original)
+++ lld/trunk/test/ELF/linkerscript/sections-constraint3.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { zed : ONLY_IF_RO { abc = 1; *(foo) } }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t.so -shared
-# RUN: llvm-readobj -t %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 # CHECK: Symbols [
 # CHECK-NOT: abc

Modified: lld/trunk/test/ELF/linkerscript/sections-constraint4.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/sections-constraint4.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/sections-constraint4.s (original)
+++ lld/trunk/test/ELF/linkerscript/sections-constraint4.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN:  .foo : ONLY_IF_RO { *(.foo) } \
 # RUN:  .bar : {bar1 = .; *(.bar) } }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK: Name: bar1
 

Modified: lld/trunk/test/ELF/linkerscript/sections-constraint5.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/sections-constraint5.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/sections-constraint5.s (original)
+++ lld/trunk/test/ELF/linkerscript/sections-constraint5.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN:       }" > %t.script
 
 # RUN: ld.lld -o %t -T %t.script %t.o
-# RUN: llvm-readobj -s -t %t | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t | FileCheck %s
 
 # CHECK: Sections [
 # CHECK:      Name: bar

Modified: lld/trunk/test/ELF/linkerscript/symbol-alias-relocation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/symbol-alias-relocation.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/symbol-alias-relocation.s (original)
+++ lld/trunk/test/ELF/linkerscript/symbol-alias-relocation.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "aliasto__text = __text; SECTIONS { .text 0x1000 : { __text = . ; *(.text) } }" > %t.script
 # RUN: ld.lld -pie -o %t --script %t.script %t.o
-# RUN: llvm-readobj -symbols %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 
 ## Check that alias 'aliasto__text' has the correct value.
 ## (It should belong to the section .text and point to it's start).

Modified: lld/trunk/test/ELF/linkerscript/symbol-only-align.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/symbol-only-align.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/symbol-only-align.test (original)
+++ lld/trunk/test/ELF/linkerscript/symbol-only-align.test Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: echo '.text; ret; .data; .quad 0' > %t.s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t.s -o %t.o
 # RUN: ld.lld -o %t --script %s %t.o -shared
-# RUN: llvm-readobj -elf-output-style=GNU -s -t -l %t | FileCheck %s
+# RUN: llvm-readobj --elf-output-style=GNU -S --symbols -l %t | FileCheck %s
 
 PHDRS {
   text PT_LOAD FLAGS(0x5);

Modified: lld/trunk/test/ELF/linkerscript/symbol-only-flags.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/symbol-only-flags.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/symbol-only-flags.test (original)
+++ lld/trunk/test/ELF/linkerscript/symbol-only-flags.test Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: echo '.section .tbss,"awT", at nobits; .quad 0' \
 # RUN:   | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o
 # RUN: ld.lld -o %t --script %s %t.o
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 SECTIONS {
   . = SIZEOF_HEADERS;

Modified: lld/trunk/test/ELF/linkerscript/tbss.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/tbss.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/tbss.s (original)
+++ lld/trunk/test/ELF/linkerscript/tbss.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:   bar : { *(bar) } \
 # RUN: }" > %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # test that a tbss section doesn't use address space.
 

Modified: lld/trunk/test/ELF/linkerscript/ttext-script.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/ttext-script.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/ttext-script.s (original)
+++ lld/trunk/test/ELF/linkerscript/ttext-script.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "SECTIONS { .text 0x200000 : { *(.text) } }" > %t.script
 # RUN: ld.lld -T %t.script -Ttext 0x100000 %t.o -o %t
-# RUN: llvm-readobj --elf-output-style=GNU -s  %t | FileCheck %s
+# RUN: llvm-readobj --elf-output-style=GNU -S  %t | FileCheck %s
 
 # CHECK: .text             PROGBITS        0000000000100000
 

Modified: lld/trunk/test/ELF/linkerscript/version-linker-symbol.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/version-linker-symbol.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/version-linker-symbol.s (original)
+++ lld/trunk/test/ELF/linkerscript/version-linker-symbol.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: echo "VER1 { global: _end; foo ; local: * ; } ;" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      Name: _end@@VER1
 # CHECK-NEXT: Value: 0

Modified: lld/trunk/test/ELF/linkerscript/visibility.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/visibility.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/visibility.s (original)
+++ lld/trunk/test/ELF/linkerscript/visibility.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: echo "SECTIONS { foo = .; }" > %t1.script
 # RUN: ld.lld -o %t1 --script %t1.script %t.o -shared
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: foo

Modified: lld/trunk/test/ELF/local-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-dynamic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-dynamic.s (original)
+++ lld/trunk/test/ELF/local-dynamic.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // Check that local symbols are not inserted into dynamic table.
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -shared -o %t1.so
-// RUN: llvm-readobj -t -dyn-symbols %t1.so | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-syms %t1.so | FileCheck %s
 
 // CHECK: Symbols [
 // CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/local-got-pie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-got-pie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-got-pie.s (original)
+++ lld/trunk/test/ELF/local-got-pie.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t -pie
-// RUN: llvm-readobj -s -r -d %t | FileCheck %s
+// RUN: llvm-readobj -S -r -d %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 .globl _start

Modified: lld/trunk/test/ELF/local-got-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-got-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-got-shared.s (original)
+++ lld/trunk/test/ELF/local-got-shared.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv %t.o -o %t -shared
-// RUN: llvm-readobj -s -r -d %t | FileCheck %s
+// RUN: llvm-readobj -S -r -d %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 bar:

Modified: lld/trunk/test/ELF/local-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-got.s (original)
+++ lld/trunk/test/ELF/local-got.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r -section-data %t | FileCheck %s
+// RUN: llvm-readobj -S -r --section-data %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
         .globl _start

Modified: lld/trunk/test/ELF/local-symbols-order.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-symbols-order.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-symbols-order.s (original)
+++ lld/trunk/test/ELF/local-symbols-order.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 
 # RUN: ld.lld -o %t %t1.o %t2.o --emit-relocs
-# RUN: llvm-readobj -symbols -sections -elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readobj --symbols --sections --elf-output-style=GNU %t | FileCheck %s
 
 ## Check we sort local symbols to match the following order: 
 ## file1, local1, section1, hidden1, file2, local2, section2, hidden2 ...

Modified: lld/trunk/test/ELF/local-undefined-symbol.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local-undefined-symbol.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/local-undefined-symbol.s (original)
+++ lld/trunk/test/ELF/local-undefined-symbol.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t1
-# RUN: llvm-readobj -t %t1 | FileCheck %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 # CHECK:     Symbols [
 # CHECK-NOT:  Name: foo

Modified: lld/trunk/test/ELF/local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/local.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/local.s (original)
+++ lld/trunk/test/ELF/local.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // Check that symbol table is correctly populated with local symbols.
 // RUN: llvm-mc -save-temp-labels -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t1
-// RUN: llvm-readobj -t -s %t1 | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t1 | FileCheck %s
 
 // Check that Info is equal to the number of local symbols.
 // CHECK:   Section {

Modified: lld/trunk/test/ELF/lto/archive-2.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/archive-2.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/archive-2.ll (original)
+++ lld/trunk/test/ELF/lto/archive-2.ll Tue Apr 30 22:49:01 2019
@@ -4,9 +4,9 @@
 ; RUN: llvm-ar rcs %t.a %t1.o
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.a -o %t3
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 ; RUN: ld.lld %t2.o --whole-archive %t.a -o %t3 -shared
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 ; CHECK:      Name: _start (
 ; CHECK-NEXT: Value:

Modified: lld/trunk/test/ELF/lto/archive.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/archive.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/archive.ll (original)
+++ lld/trunk/test/ELF/lto/archive.ll Tue Apr 30 22:49:01 2019
@@ -4,9 +4,9 @@
 ; RUN: llvm-ar rcs %t.a %t1.o
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.a -o %t3 -shared
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 ; RUN: ld.lld %t2.o --whole-archive %t.a -o %t3 -shared
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 ; CHECK:      Name: g (
 ; CHECK-NEXT: Value:

Modified: lld/trunk/test/ELF/lto/comdat.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/comdat.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/comdat.ll (original)
+++ lld/trunk/test/ELF/lto/comdat.ll Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: foo
 ; CHECK-NEXT: Value:

Modified: lld/trunk/test/ELF/lto/comdat2.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/comdat2.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/comdat2.ll (original)
+++ lld/trunk/test/ELF/lto/comdat2.ll Tue Apr 30 22:49:01 2019
@@ -2,9 +2,9 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/comdat.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 ; RUN: ld.lld %t2.o %t.o -o %t2.so -shared
-; RUN: llvm-readobj -t %t2.so | FileCheck %s --check-prefix=OTHER
+; RUN: llvm-readobj --symbols %t2.so | FileCheck %s --check-prefix=OTHER
 
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

Modified: lld/trunk/test/ELF/lto/common.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/common.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/common.ll (original)
+++ lld/trunk/test/ELF/lto/common.ll Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -s -t %t.so | FileCheck %s
+; RUN: llvm-readobj -S --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: .bss
 ; CHECK-NEXT: Type: SHT_NOBITS

Modified: lld/trunk/test/ELF/lto/common2.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/common2.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/common2.ll (original)
+++ lld/trunk/test/ELF/lto/common2.ll Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: ld.lld %t1.o -o %t -shared -save-temps
 ; RUN: llvm-dis < %t.0.2.internalize.bc | FileCheck %s
-; RUN: llvm-readobj -t %t | FileCheck %s --check-prefix=SHARED
+; RUN: llvm-readobj --symbols %t | FileCheck %s --check-prefix=SHARED
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

Modified: lld/trunk/test/ELF/lto/ctors.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/ctors.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/ctors.ll (original)
+++ lld/trunk/test/ELF/lto/ctors.ll Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.so -shared
-; RUN: llvm-readobj -sections %t.so | FileCheck %s
+; RUN: llvm-readobj --sections %t.so | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

Modified: lld/trunk/test/ELF/lto/dynamic-list.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/dynamic-list.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/dynamic-list.ll (original)
+++ lld/trunk/test/ELF/lto/dynamic-list.ll Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: echo "{ foo; };" > %t.list
 ; RUN: ld.lld -o %t --dynamic-list %t.list -pie %t.o
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 ; CHECK:      Name:     foo
 ; CHECK-NEXT: Value:    0x1010

Modified: lld/trunk/test/ELF/lto/dynsym.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/dynsym.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/dynsym.ll (original)
+++ lld/trunk/test/ELF/lto/dynsym.ll Tue Apr 30 22:49:01 2019
@@ -3,12 +3,12 @@
 ; RUN: ld.lld %t.o -o %t.so -shared
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.so -o %t
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 ; Check that we don't crash when gc'ing sections and printing the result.
 ; RUN: ld.lld %t2.o %t.so --gc-sections --print-gc-sections \
 ; RUN:   -o %t
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

Modified: lld/trunk/test/ELF/lto/linker-script-symbols-assign.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/linker-script-symbols-assign.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/linker-script-symbols-assign.ll (original)
+++ lld/trunk/test/ELF/lto/linker-script-symbols-assign.ll Tue Apr 30 22:49:01 2019
@@ -3,12 +3,12 @@
 
 ; RUN: echo "foo = 1;" > %t.script
 ; RUN: ld.lld %t.o -o %t2 --script %t.script -save-temps
-; RUN: llvm-readobj -symbols %t2.lto.o | FileCheck %s
+; RUN: llvm-readobj --symbols %t2.lto.o | FileCheck %s
 
 ; CHECK-NOT: bar
 ; CHECK-NOT: foo
 
-; RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=VAL
+; RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=VAL
 ; VAL:       Symbol {
 ; VAL:        Name: foo
 ; VAL-NEXT:   Value: 0x1
@@ -21,7 +21,7 @@
 
 ; RUN: echo "zed = 1;" > %t2.script
 ; RUN: ld.lld %t.o -o %t3 --script %t2.script
-; RUN: llvm-readobj -symbols %t3 | FileCheck %s --check-prefix=ABS
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s --check-prefix=ABS
 ; ABS:      Symbol {
 ; ABS:        Name: zed
 ; ABS-NEXT:   Value: 0x1

Modified: lld/trunk/test/ELF/lto/linker-script-symbols.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/linker-script-symbols.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/linker-script-symbols.ll (original)
+++ lld/trunk/test/ELF/lto/linker-script-symbols.ll Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 ; RUN: echo "foo = bar;" > %t.script
 
 ; RUN: ld.lld %t.o -o %t2 --script %t.script -save-temps
-; RUN: llvm-readobj -symbols %t2.lto.o | FileCheck %s
+; RUN: llvm-readobj --symbols %t2.lto.o | FileCheck %s
 
 ; CHECK: Symbols [
 ; CHECK-NOT:  zed

Modified: lld/trunk/test/ELF/lto/lto-start.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/lto-start.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/lto-start.ll (original)
+++ lld/trunk/test/ELF/lto/lto-start.ll Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t2
-; RUN: llvm-readobj -t %t2 | FileCheck %s
+; RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 ; CHECK:      Format: ELF64-x86-64
 ; CHECK-NEXT: Arch: x86_64

Modified: lld/trunk/test/ELF/lto/obj-path.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/obj-path.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/obj-path.ll (original)
+++ lld/trunk/test/ELF/lto/obj-path.ll Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 ; Test to ensure that obj-path creates the ELF file.
 ; RUN: rm -f %t4.o
 ; RUN: ld.lld --plugin-opt=obj-path=%t4.o -shared %t1.o %t2.o -o %t3
-; RUN: llvm-readobj -t %t3 | FileCheck %s
+; RUN: llvm-readobj --symbols %t3 | FileCheck %s
 ; RUN: llvm-readobj -h %t4.o1 | FileCheck %s -check-prefix=ELF1
 ; RUN: llvm-readobj -h %t4.o2 | FileCheck %s -check-prefix=ELF2
 ; RUN: llvm-nm %t4.o1 2>&1 | FileCheck %s -check-prefix=NM1

Modified: lld/trunk/test/ELF/lto/parallel-internalize.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/parallel-internalize.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/parallel-internalize.ll (original)
+++ lld/trunk/test/ELF/lto/parallel-internalize.ll Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 ; RUN: rm -f %t.lto.o %t1.lto.o
 ; RUN: ld.lld --lto-partitions=2 -save-temps -o %t %t.bc \
 ; RUN:   -e foo --lto-O0
-; RUN: llvm-readobj -t -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --symbols --dyn-syms %t | FileCheck %s
 ; RUN: llvm-nm %t.lto.o | FileCheck --check-prefix=CHECK0 %s
 ; RUN: llvm-nm %t1.lto.o | FileCheck --check-prefix=CHECK1 %s
 

Modified: lld/trunk/test/ELF/lto/relocatable.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/relocatable.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/relocatable.ll (original)
+++ lld/trunk/test/ELF/lto/relocatable.ll Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: ld.lld %t1.o -r -o %t
-; RUN: llvm-readobj -symbols %t | FileCheck %s
+; RUN: llvm-readobj --symbols %t | FileCheck %s
 
 ; CHECK:       Symbols [
 ; CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/lto/resolution.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/resolution.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/resolution.ll (original)
+++ lld/trunk/test/ELF/lto/resolution.ll Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/resolution.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -s --section-data %t.so | FileCheck %s
+; RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 ; CHECK:      Name: .data
 ; CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/lto/shlib-undefined.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/shlib-undefined.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/shlib-undefined.ll (original)
+++ lld/trunk/test/ELF/lto/shlib-undefined.ll Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 ; RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t2.s -o %t2.o
 ; RUN: ld.lld -shared %t2.o -o %t2.so
 ; RUN: ld.lld -o %t %t.o %t2.so
-; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 ; CHECK:      Name:     __progname
 ; CHECK-NEXT: Value:    0x201010

Modified: lld/trunk/test/ELF/lto/tls-preserve.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/tls-preserve.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/tls-preserve.ll (original)
+++ lld/trunk/test/ELF/lto/tls-preserve.ll Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: ld.lld -shared %t1.o -o %t1
-; RUN: llvm-readobj -t %t1 | FileCheck %s
+; RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

Modified: lld/trunk/test/ELF/lto/undef-mixed.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/undef-mixed.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/undef-mixed.ll (original)
+++ lld/trunk/test/ELF/lto/undef-mixed.ll Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 ; RUN: llvm-mc %p/Inputs/undef-mixed.s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: bar
 ; CHECK-NEXT: Value:

Modified: lld/trunk/test/ELF/lto/undef-weak.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/undef-weak.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/undef-weak.ll (original)
+++ lld/trunk/test/ELF/lto/undef-weak.ll Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t2.o -o %t2.so %t.a -shared
-; RUN: llvm-readobj -t %t2.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t2.so | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

Modified: lld/trunk/test/ELF/lto/undef.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/undef.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/undef.ll (original)
+++ lld/trunk/test/ELF/lto/undef.ll Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

Modified: lld/trunk/test/ELF/lto/undefined-puts.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/undefined-puts.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/undefined-puts.ll (original)
+++ lld/trunk/test/ELF/lto/undefined-puts.ll Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 ; RUN: ld.lld %t1.o -o %t1.so -shared
 ; RUN: llvm-as %s -o %t2.o
 ; RUN: ld.lld %t1.so %t2.o -o %t
-; RUN: llvm-readobj -dyn-symbols -dyn-relocations %t | FileCheck %s
+; RUN: llvm-readobj --dyn-syms --dyn-relocations %t | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

Modified: lld/trunk/test/ELF/lto/version-script.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/version-script.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/version-script.ll (original)
+++ lld/trunk/test/ELF/lto/version-script.ll Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 ; RUN: echo "VERSION_1.0{ global: foo; local: *; }; VERSION_2.0{ global: bar; local: *; };" > %t.script
 ; RUN: ld.lld %t.o -o %t2 -shared --version-script %t.script -save-temps
 ; RUN: llvm-dis < %t2.0.0.preopt.bc | FileCheck %s
-; RUN: llvm-readobj -V -dyn-symbols %t2 | FileCheck --check-prefix=DSO %s
+; RUN: llvm-readobj -V --dyn-syms %t2 | FileCheck --check-prefix=DSO %s
 
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

Modified: lld/trunk/test/ELF/lto/version-script2.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/version-script2.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/version-script2.ll (original)
+++ lld/trunk/test/ELF/lto/version-script2.ll Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: echo "VER1 {};" > %t.script
 ; RUN: ld.lld %t.o -o %t.so -shared --version-script %t.script
-; RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+; RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 ; test that we have the correct version.
 ; CHECK: Name: foo@@VER1 (

Modified: lld/trunk/test/ELF/lto/visibility.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/visibility.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/visibility.ll (original)
+++ lld/trunk/test/ELF/lto/visibility.ll Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 ; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/visibility.s -o %t2.o -filetype=obj
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared -save-temps
 ; RUN: llvm-dis < %t.so.0.2.internalize.bc | FileCheck --check-prefix=IR %s
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 ; CHECK:      Name: g
 ; CHECK-NEXT: Value: 0x1000

Modified: lld/trunk/test/ELF/lto/weak.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/weak.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/weak.ll (original)
+++ lld/trunk/test/ELF/lto/weak.ll Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o %t.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 target triple = "x86_64-unknown-linux-gnu"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

Modified: lld/trunk/test/ELF/lto/weakodr-visibility.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/weakodr-visibility.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/weakodr-visibility.ll (original)
+++ lld/trunk/test/ELF/lto/weakodr-visibility.ll Tue Apr 30 22:49:01 2019
@@ -9,7 +9,7 @@
 ; but keeps `protected` visibility.
 
 ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 ; RUN: llvm-objdump -d %t.so | FileCheck %s --check-prefix=FIRST
 ; CHECK:       Symbol {
 ; CHECK:        Name: foo
@@ -27,7 +27,7 @@
 
 ; Now swap the files order.
 ; RUN: ld.lld %t2.o %t1.o -o %t.so -shared
-; RUN: llvm-readobj -t %t.so | FileCheck %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck %s
 ; RUN: llvm-objdump -d %t.so | FileCheck %s --check-prefix=SECOND
 ; SECOND:      foo:
 ; SECOND-NEXT:   movl    $42, %eax

Modified: lld/trunk/test/ELF/lto/wrap-1.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/wrap-1.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/wrap-1.ll (original)
+++ lld/trunk/test/ELF/lto/wrap-1.ll Tue Apr 30 22:49:01 2019
@@ -2,13 +2,13 @@
 ; LTO
 ; RUN: llvm-as %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.out -wrap=bar -save-temps
-; RUN: llvm-readobj -t %t.out | FileCheck %s
+; RUN: llvm-readobj --symbols %t.out | FileCheck %s
 ; RUN: cat %t.out.resolution.txt | FileCheck -check-prefix=RESOLS %s
 
 ; ThinLTO
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: ld.lld %t.o -o %t.out -wrap=bar -save-temps
-; RUN: llvm-readobj -t %t.out | FileCheck %s
+; RUN: llvm-readobj --symbols %t.out | FileCheck %s
 ; RUN: cat %t.out.resolution.txt | FileCheck -check-prefix=RESOLS %s
 
 ; CHECK:      Name: __wrap_bar

Modified: lld/trunk/test/ELF/lto/wrap-2.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/wrap-2.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/wrap-2.ll (original)
+++ lld/trunk/test/ELF/lto/wrap-2.ll Tue Apr 30 22:49:01 2019
@@ -4,14 +4,14 @@
 ; RUN: llvm-as %S/Inputs/wrap-bar.ll -o %t1.o
 ; RUN: ld.lld %t.o %t1.o -shared -o %t.so -wrap=bar
 ; RUN: llvm-objdump -d %t.so | FileCheck %s
-; RUN: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck -check-prefix=BIND %s
 
 ; ThinLTO
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: opt -module-summary %S/Inputs/wrap-bar.ll -o %t1.o
 ; RUN: ld.lld %t.o %t1.o -shared -o %t.so -wrap=bar
 ; RUN: llvm-objdump -d %t.so | FileCheck %s
-; RUN: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s
+; RUN: llvm-readobj --symbols %t.so | FileCheck -check-prefix=BIND %s
 
 ; Make sure that calls in foo() are not eliminated and that bar is
 ; routed to __wrap_bar and __real_bar is routed to bar.

Modified: lld/trunk/test/ELF/many-alloc-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/many-alloc-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/many-alloc-sections.s (original)
+++ lld/trunk/test/ELF/many-alloc-sections.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
 // RUN: echo "SECTIONS { . = SIZEOF_HEADERS; .text : { *(.text) } }" > %t.script
 // RUN: ld.lld -T %t.script %t.o -o %t
-// RUN: llvm-readobj -t %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
 
 // Test that _start is in the correct section.
 // CHECK:      Name: _start

Modified: lld/trunk/test/ELF/many-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/many-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/many-sections.s (original)
+++ lld/trunk/test/ELF/many-sections.s Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
-// RUN: llvm-readobj -t %t | FileCheck  %s
+// RUN: llvm-readobj --symbols %t | FileCheck  %s
 
 // Verify that the symbol _start is in a section with an index >= SHN_LORESERVE.
 // CHECK:      Name: _start
@@ -12,12 +12,12 @@
 // CHECK-NEXT: Section: dm (0xFF00)
 
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck --check-prefix=LINKED %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck --check-prefix=LINKED %s
 
 // Test also with a linker script.
 // RUN: echo "SECTIONS { . = SIZEOF_HEADERS; .text : { *(.text) } }" > %t.script
 // RUN: ld.lld -T %t.script %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck --check-prefix=LINKED %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck --check-prefix=LINKED %s
 
 // Test that _start is in the correct section.
 // LINKED:      Name: _start

Modified: lld/trunk/test/ELF/merge-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-align.s (original)
+++ lld/trunk/test/ELF/merge-align.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         .section        .rodata.foo,"aM", at progbits,1
         .align  16

Modified: lld/trunk/test/ELF/merge-entsize.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-entsize.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-entsize.s (original)
+++ lld/trunk/test/ELF/merge-entsize.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 
         .section  .rodata.1,"aM", at progbits,1
         .p2align 2

Modified: lld/trunk/test/ELF/merge-gc-piece.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-gc-piece.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-gc-piece.s (original)
+++ lld/trunk/test/ELF/merge-gc-piece.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-# RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 
 # CHECK:      Name: .foo

Modified: lld/trunk/test/ELF/merge-gc-piece2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-gc-piece2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-gc-piece2.s (original)
+++ lld/trunk/test/ELF/merge-gc-piece2.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.so -shared --gc-sections
-# RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
 # CHECK:      Name: .bar
 # CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/merge-reloc-O0.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-reloc-O0.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-reloc-O0.s (original)
+++ lld/trunk/test/ELF/merge-reloc-O0.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -r -o %t2.o -O0
-# RUN: llvm-readobj -s -section-data %t2.o | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t2.o | FileCheck %s
 
 # We combine just the sections with the same name and sh_entsize.
 

Modified: lld/trunk/test/ELF/merge-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-reloc.s (original)
+++ lld/trunk/test/ELF/merge-reloc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -r -o %t-rel
-# RUN: llvm-readobj -s -section-data %t-rel | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t-rel | FileCheck %s
 
 # When linker generates a relocatable object it does string merging in the same
 # way as for regular link. It should keep SHF_MERGE flag and set proper sh_entsize

Modified: lld/trunk/test/ELF/merge-section-types.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-section-types.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-section-types.s (original)
+++ lld/trunk/test/ELF/merge-section-types.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t
-// RUN: llvm-readobj -s %t | FileCheck %s
+// RUN: llvm-readobj -S %t | FileCheck %s
 
 // CHECK:      Name: .foo
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/merge-shared-str.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-shared-str.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-shared-str.s (original)
+++ lld/trunk/test/ELF/merge-shared-str.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared -O3
-// RUN: llvm-readobj -r -s %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S %t.so | FileCheck %s
 
 
         .section        foo,"aMS", at progbits,1

Modified: lld/trunk/test/ELF/merge-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-shared.s (original)
+++ lld/trunk/test/ELF/merge-shared.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S %t.so | FileCheck %s
 
 	.section	foo,"aM", at progbits,4
         .long 42

Modified: lld/trunk/test/ELF/merge-string-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-string-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-string-align.s (original)
+++ lld/trunk/test/ELF/merge-string-align.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         .section        .rodata.foo,"aMS", at progbits,1
         .align  16

Modified: lld/trunk/test/ELF/merge-string.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-string.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-string.s (original)
+++ lld/trunk/test/ELF/merge-string.s Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -O 2 %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck %s
 // RUN: ld.lld -O 1 %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck --check-prefix=NOTAIL %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck --check-prefix=NOTAIL %s
 // RUN: ld.lld -O 0 %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck --check-prefix=NOMERGE %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck --check-prefix=NOMERGE %s
 
         .section	.rodata1,"aMS", at progbits,1
 	.asciz	"abc"

Modified: lld/trunk/test/ELF/merge-sym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-sym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-sym.s (original)
+++ lld/trunk/test/ELF/merge-sym.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -t -s %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t.so | FileCheck %s
 
         .section        .rodata.cst4,"aM", at progbits,4
         .short 0

Modified: lld/trunk/test/ELF/merge-to-non-alloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge-to-non-alloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge-to-non-alloc.s (original)
+++ lld/trunk/test/ELF/merge-to-non-alloc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -s -section-data -t %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck %s
 
 // CHECK:      Name: .bar
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/merge.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/merge.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/merge.s (original)
+++ lld/trunk/test/ELF/merge.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/merge.s -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
-// RUN: llvm-readobj -s -section-data -t %t | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
         .section        .mysec,"aM", at progbits,4

Modified: lld/trunk/test/ELF/mips-26.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-26.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-26.s (original)
+++ lld/trunk/test/ELF/mips-26.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: ld.lld %t2.o -shared -o %t.so
 # RUN: ld.lld %t1.o %t.so -o %t.exe
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
-# RUN: llvm-readobj -dynamic-table -s -r -mips-plt-got %t.exe \
+# RUN: llvm-readobj --dynamic-table -S -r --mips-plt-got %t.exe \
 # RUN:   | FileCheck -check-prefix=REL %s
 
 # CHECK:      Disassembly of section .text:

Modified: lld/trunk/test/ELF/mips-32.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-32.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-32.s (original)
+++ lld/trunk/test/ELF/mips-32.s Tue Apr 30 22:49:01 2019
@@ -5,14 +5,14 @@
 # RUN: ld.lld -shared %t-be.o -o %t-be.so
 # RUN: llvm-objdump -t -s %t-be.so \
 # RUN:   | FileCheck -check-prefix=SYM -check-prefix=BE %s
-# RUN: llvm-readobj -r -dynamic-table -mips-plt-got %t-be.so \
+# RUN: llvm-readobj -r --dynamic-table --mips-plt-got %t-be.so \
 # RUN:   | FileCheck -check-prefix=REL %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
 # RUN: ld.lld -shared %t-el.o -o %t-el.so
 # RUN: llvm-objdump -t -s %t-el.so \
 # RUN:   | FileCheck -check-prefix=SYM -check-prefix=EL %s
-# RUN: llvm-readobj -r -dynamic-table -mips-plt-got %t-el.so \
+# RUN: llvm-readobj -r --dynamic-table --mips-plt-got %t-el.so \
 # RUN:   | FileCheck -check-prefix=REL %s
 
   .globl  __start

Modified: lld/trunk/test/ELF/mips-64-disp.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-64-disp.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-disp.s (original)
+++ lld/trunk/test/ELF/mips-64-disp.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.exe.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -t %t.exe | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
 
 # CHECK:      __start:
 # CHECK-NEXT:    20000:   24 42 80 40   addiu   $2, $2, -32704

Modified: lld/trunk/test/ELF/mips-64-got-overflow.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-64-got-overflow.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-got-overflow.s (original)
+++ lld/trunk/test/ELF/mips-64-got-overflow.s Tue Apr 30 22:49:01 2019
@@ -6,8 +6,8 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t2.so.o
 # RUN: ld.lld -shared -mips-got-size 32 %t1.so.o %t2.so.o -o %t-sgot.so
 # RUN: ld.lld -shared -mips-got-size 24 %t1.so.o %t2.so.o -o %t-mgot.so
-# RUN: llvm-readobj -r -dt -mips-plt-got %t-sgot.so | FileCheck -check-prefix=SGOT %s
-# RUN: llvm-readobj -r -dt -mips-plt-got %t-mgot.so | FileCheck -check-prefix=MGOT %s
+# RUN: llvm-readobj -r --dyn-syms --mips-plt-got %t-sgot.so | FileCheck -check-prefix=SGOT %s
+# RUN: llvm-readobj -r --dyn-syms --mips-plt-got %t-mgot.so | FileCheck -check-prefix=MGOT %s
 
 # SGOT:      Primary GOT {
 # SGOT-NEXT:   Canonical gp value: 0x27FF0

Modified: lld/trunk/test/ELF/mips-64-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-64-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64-got.s (original)
+++ lld/trunk/test/ELF/mips-64-got.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.exe.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -t %t.exe | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
 
 # CHECK:      __start:
 

Modified: lld/trunk/test/ELF/mips-64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-64.s (original)
+++ lld/trunk/test/ELF/mips-64.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
 # RUN: llvm-objdump -t %t.so | FileCheck -check-prefix=SYM %s
-# RUN: llvm-readobj -r -dynamic-table -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj -r --dynamic-table --mips-plt-got %t.so | FileCheck %s
 
   .global  __start
 __start:

Modified: lld/trunk/test/ELF/mips-abs-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-abs-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-abs-got.s (original)
+++ lld/trunk/test/ELF/mips-abs-got.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: echo "SECTIONS { \
 # RUN:          zero = 0; foo = 0x11004; bar = 0x22000; }" > %t.script
 # RUN: ld.lld --script %t.script -o %t.exe %t.o
-# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Static GOT {
 # CHECK:        Local entries [

Modified: lld/trunk/test/ELF/mips-call-hilo.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-call-hilo.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-call-hilo.s (original)
+++ lld/trunk/test/ELF/mips-call-hilo.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
 # RUN: llvm-objdump -d %t.so | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Disassembly of section .text:
 # CHECK-NEXT: foo:

Modified: lld/trunk/test/ELF/mips-call16.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-call16.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-call16.s (original)
+++ lld/trunk/test/ELF/mips-call16.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.exe
 # RUN: llvm-objdump -d %t.exe | FileCheck %s
-# RUN: llvm-readobj -mips-plt-got -symbols %t.exe \
+# RUN: llvm-readobj --mips-plt-got --symbols %t.exe \
 # RUN:   | FileCheck -check-prefix=GOT %s
 
   .text

Modified: lld/trunk/test/ELF/mips-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-dynamic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-dynamic.s (original)
+++ lld/trunk/test/ELF/mips-dynamic.s Tue Apr 30 22:49:01 2019
@@ -6,19 +6,19 @@
 # RUN: ld.lld -shared %td.o -o %td.so
 
 # RUN: ld.lld %t.o %td.so -o %t.exe
-# RUN: llvm-readobj -sections -dynamic-table %t.exe \
+# RUN: llvm-readobj --sections --dynamic-table %t.exe \
 # RUN:   | FileCheck -check-prefixes=EXE,NOPIE %s
 
 # RUN: ld.lld -pie %t.o %td.so -o %t.so
-# RUN: llvm-readobj -sections -dyn-symbols -dynamic-table %t.so \
+# RUN: llvm-readobj --sections --dyn-syms --dynamic-table %t.so \
 # RUN:   | FileCheck -check-prefixes=EXE,PIE %s
 
 # RUN: ld.lld %t.o --image-base=0x123000 %td.so -o %t.exe
-# RUN: llvm-readobj -sections -dynamic-table %t.exe \
+# RUN: llvm-readobj --sections --dynamic-table %t.exe \
 # RUN:   | FileCheck -check-prefix=IMAGE_BASE %s
 
 # RUN: ld.lld -shared %t.o %td.so -o %t.so
-# RUN: llvm-readobj -sections -dyn-symbols -dynamic-table %t.so \
+# RUN: llvm-readobj --sections --dyn-syms --dynamic-table %t.so \
 # RUN:   | FileCheck -check-prefix=DSO %s
 
 # EXE:      Sections [

Modified: lld/trunk/test/ELF/mips-dynsym-sort.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-dynsym-sort.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-dynsym-sort.s (original)
+++ lld/trunk/test/ELF/mips-dynsym-sort.s Tue Apr 30 22:49:01 2019
@@ -3,11 +3,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
 # RUN: ld.lld -shared %t-be.o -o %t-be.so
-# RUN: llvm-readobj -symbols -dyn-symbols %t-be.so | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms %t-be.so | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
 # RUN: ld.lld -shared %t-el.o -o %t-el.so
-# RUN: llvm-readobj -symbols -dyn-symbols %t-el.so | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms %t-el.so | FileCheck %s
 
   .data
   .globl v1,v2,v3

Modified: lld/trunk/test/ELF/mips-elf-flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-elf-flags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-elf-flags.s (original)
+++ lld/trunk/test/ELF/mips-elf-flags.s Tue Apr 30 22:49:01 2019
@@ -4,16 +4,16 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         %S/Inputs/mips-dynamic.s -o %t-so.o
 # RUN: ld.lld %t-so.o --gc-sections -shared -o %t.so
-# RUN: llvm-readobj -h -mips-abi-flags %t.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -h --mips-abi-flags %t.so | FileCheck -check-prefix=SO %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t.exe | FileCheck -check-prefix=EXE %s
+# RUN: llvm-readobj -h --mips-abi-flags %t.exe | FileCheck -check-prefix=EXE %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mcpu=mips32r2 %s -o %t-r2.o
 # RUN: ld.lld %t-r2.o -o %t-r2.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t-r2.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t-r2.exe \
 # RUN:   | FileCheck -check-prefix=EXE-R2 %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
@@ -21,26 +21,26 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mcpu=mips32r5 %S/Inputs/mips-dynamic.s -o %t-r5.o
 # RUN: ld.lld %t-r2.o %t-r5.o -o %t-r5.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t-r5.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t-r5.exe \
 # RUN:   | FileCheck -check-prefix=EXE-R5 %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mcpu=mips32r6 %s -o %t-r6.o
 # RUN: ld.lld %t-r6.o -o %t-r6.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t-r6.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t-r6.exe \
 # RUN:   | FileCheck -check-prefix=EXE-R6 %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux \
 # RUN:         -position-independent -mcpu=octeon %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t.exe \
+# RUN: llvm-readobj -h --mips-abi-flags %t.exe \
 # RUN:   | FileCheck -check-prefix=OCTEON %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mattr=micromips %S/Inputs/mips-fpic.s -o %t-mm.o
 # RUN: ld.lld %t.o %t-mm.o -o %t.exe
-# RUN: llvm-readobj -h -mips-abi-flags %t.exe | FileCheck -check-prefix=MICRO %s
+# RUN: llvm-readobj -h --mips-abi-flags %t.exe | FileCheck -check-prefix=MICRO %s
 
   .text
   .globl  __start

Modified: lld/trunk/test/ELF/mips-got-and-copy.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-and-copy.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-and-copy.s (original)
+++ lld/trunk/test/ELF/mips-got-and-copy.s Tue Apr 30 22:49:01 2019
@@ -10,7 +10,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (7) .rel.dyn {

Modified: lld/trunk/test/ELF/mips-got-extsym.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-extsym.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-extsym.s (original)
+++ lld/trunk/test/ELF/mips-got-extsym.s Tue Apr 30 22:49:01 2019
@@ -9,7 +9,7 @@
 # RUN: ld.lld -shared %t.so.o -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dt -t -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms --symbols --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Symbols [
 # CHECK:        Symbol {

Modified: lld/trunk/test/ELF/mips-got-hilo.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-hilo.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-hilo.s (original)
+++ lld/trunk/test/ELF/mips-got-hilo.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
 # RUN: llvm-objdump -d %t.so | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Disassembly of section .text:
 # CHECK-NEXT: foo:

Modified: lld/trunk/test/ELF/mips-got-page-script.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-page-script.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-page-script.s (original)
+++ lld/trunk/test/ELF/mips-got-page-script.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:          .text : { *(.text) } \
 # RUN:          .data 0x10000 : { *(.data) } }" > %t.script
 # RUN: ld.lld -shared --script %t.script -o %t.so %t.o
-# RUN: llvm-readobj -t -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols --mips-plt-got %t.so | FileCheck %s
 
 # CHECK:      Name: foo1
 # CHECK-NEXT: Value: 0x10000

Modified: lld/trunk/test/ELF/mips-got-page.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-page.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-page.s (original)
+++ lld/trunk/test/ELF/mips-got-page.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux -o %t.o %s
 # RUN: ld.lld --section-start .rodata=0x27FFC -shared -o %t.so %t.o
-# RUN: llvm-readobj -t -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols --mips-plt-got %t.so | FileCheck %s
 
 # CHECK:       Name: bar
 # CHECK-NEXT:  Value: 0x28000

Modified: lld/trunk/test/ELF/mips-got-redundant.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-redundant.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-redundant.s (original)
+++ lld/trunk/test/ELF/mips-got-redundant.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readobj -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got %t.so | FileCheck %s
 
 # CHECK:      Local entries [
 # CHECK-NEXT:   Entry {

Modified: lld/trunk/test/ELF/mips-got-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-relocs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-relocs.s (original)
+++ lld/trunk/test/ELF/mips-got-relocs.s Tue Apr 30 22:49:01 2019
@@ -3,23 +3,23 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t-be.o
 # RUN: ld.lld %t-be.o -o %t-be.exe
-# RUN: llvm-readobj -sections -relocations -symbols -mips-plt-got %t-be.exe \
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-be.exe \
 # RUN:   | FileCheck -check-prefixes=ELF,EXE %s
 # RUN: llvm-objdump -d %t-be.exe | FileCheck -check-prefix=DIS %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %t-el.o
 # RUN: ld.lld %t-el.o -o %t-el.exe
-# RUN: llvm-readobj -sections -relocations -symbols -mips-plt-got %t-el.exe \
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-el.exe \
 # RUN:   | FileCheck -check-prefixes=ELF,EXE %s
 # RUN: llvm-objdump -d %t-el.exe | FileCheck -check-prefix=DIS %s
 
 # RUN: ld.lld -shared %t-be.o -o %t-be.so
-# RUN: llvm-readobj -sections -relocations -symbols -mips-plt-got %t-be.so \
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-be.so \
 # RUN:   | FileCheck -check-prefixes=ELF,DSO %s
 # RUN: llvm-objdump -d %t-be.so | FileCheck -check-prefix=DIS %s
 
 # RUN: ld.lld -shared %t-el.o -o %t-el.so
-# RUN: llvm-readobj -sections -relocations -symbols -mips-plt-got %t-el.so \
+# RUN: llvm-readobj --sections -r --symbols --mips-plt-got %t-el.so \
 # RUN:   | FileCheck -check-prefixes=ELF,DSO %s
 # RUN: llvm-objdump -d %t-el.so | FileCheck -check-prefix=DIS %s
 

Modified: lld/trunk/test/ELF/mips-got-script.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-script.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-script.s (original)
+++ lld/trunk/test/ELF/mips-got-script.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: echo "SECTIONS { .data : { *(.data.1); . += 0x10000; *(.data.2) } }" > %t.script
 # RUN: ld.lld %t.o -shared -o %t.so -T %t.script
-# RUN: llvm-readobj -mips-plt-got -dynamic-table %t.so | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got --dynamic-table %t.so | FileCheck %s
 
 # CHECK: 0x7000000A MIPS_LOCAL_GOTNO 4
 #                                    ^-- 2 * header + 2 local entries

Modified: lld/trunk/test/ELF/mips-got-string.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-string.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-string.s (original)
+++ lld/trunk/test/ELF/mips-got-string.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -o %t.o %s
 # RUN: ld.lld -shared -o %t.so %t.o
-# RUN: llvm-readobj -t -mips-plt-got %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols --mips-plt-got %t.so | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: $.str

Modified: lld/trunk/test/ELF/mips-got-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got-weak.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got-weak.s (original)
+++ lld/trunk/test/ELF/mips-got-weak.s Tue Apr 30 22:49:01 2019
@@ -3,10 +3,10 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t1.so
-# RUN: llvm-readobj -r -dt -dynamic-table -mips-plt-got %t1.so \
+# RUN: llvm-readobj -r --dyn-syms --dynamic-table --mips-plt-got %t1.so \
 # RUN:   | FileCheck -check-prefixes=CHECK,NOSYM %s
 # RUN: ld.lld %t.o -shared -Bsymbolic -o %t2.so
-# RUN: llvm-readobj -r -dt -dynamic-table -mips-plt-got %t2.so \
+# RUN: llvm-readobj -r --dyn-syms --dynamic-table --mips-plt-got %t2.so \
 # RUN:   | FileCheck -check-prefixes=CHECK,SYM %s
 
 # CHECK:      Relocations [

Modified: lld/trunk/test/ELF/mips-got16.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-got16.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-got16.s (original)
+++ lld/trunk/test/ELF/mips-got16.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
 # RUN: llvm-objdump -d -t %t.so | FileCheck %s
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Disassembly of section .text:
 # CHECK-NEXT: __start:

Modified: lld/trunk/test/ELF/mips-gp-disp.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-gp-disp.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-gp-disp.s (original)
+++ lld/trunk/test/ELF/mips-gp-disp.s Tue Apr 30 22:49:01 2019
@@ -4,11 +4,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared -o %t.so %t.o %S/Inputs/mips-gp-disp.so
-# RUN: llvm-readobj -symbols %t.so | FileCheck -check-prefix=INT-SO %s
-# RUN: llvm-readobj -symbols %S/Inputs/mips-gp-disp.so \
+# RUN: llvm-readobj --symbols %t.so | FileCheck -check-prefix=INT-SO %s
+# RUN: llvm-readobj --symbols %S/Inputs/mips-gp-disp.so \
 # RUN:   | FileCheck -check-prefix=EXT-SO %s
 # RUN: llvm-objdump -d -t %t.so | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -relocations %t.so | FileCheck -check-prefix=REL %s
+# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
 
 # INT-SO:      Name: _gp_disp
 # INT-SO-NEXT: Value:

Modified: lld/trunk/test/ELF/mips-gp-lowest.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-gp-lowest.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-gp-lowest.s (original)
+++ lld/trunk/test/ELF/mips-gp-lowest.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:          .sdata : { *(.sdata) } \
 # RUN:          .got  : { *(.got) } }" > %t.rel.script
 # RUN: ld.lld %t.o --script %t.rel.script -shared -o %t.so
-# RUN: llvm-readobj -s -t %t.so | FileCheck %s
+# RUN: llvm-readobj -S --symbols %t.so | FileCheck %s
 
   .text
   .global foo

Modified: lld/trunk/test/ELF/mips-gprel-sec.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-gprel-sec.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-gprel-sec.s (original)
+++ lld/trunk/test/ELF/mips-gprel-sec.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readobj -s %t.so | FileCheck %s
+# RUN: llvm-readobj -S %t.so | FileCheck %s
 
   .text
   nop

Modified: lld/trunk/test/ELF/mips-gprel32-relocs-gp0.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-gprel32-relocs-gp0.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-gprel32-relocs-gp0.s (original)
+++ lld/trunk/test/ELF/mips-gprel32-relocs-gp0.s Tue Apr 30 22:49:01 2019
@@ -3,10 +3,10 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld -r -o %t-rel.o %t.o
-# RUN: llvm-readobj -mips-reginfo %t-rel.o | FileCheck --check-prefix=REL %s
+# RUN: llvm-readobj --mips-reginfo %t-rel.o | FileCheck --check-prefix=REL %s
 
 # RUN: ld.lld -shared -o %t.so %S/Inputs/mips-gp0-non-zero.o
-# RUN: llvm-readobj -mips-reginfo %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj --mips-reginfo %t.so | FileCheck --check-prefix=DSO %s
 # RUN: llvm-objdump -s -t %t.so | FileCheck --check-prefix=DUMP %s
 
 # REL: GP: 0x0

Modified: lld/trunk/test/ELF/mips-jalr.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-jalr.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-jalr.test (original)
+++ lld/trunk/test/ELF/mips-jalr.test Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o -o %t.so -shared
 # RUN: llvm-objdump -d %t.so | FileCheck %s
-# RUN: llvm-readobj -relocations %t.so | FileCheck -check-prefix=REL %s
+# RUN: llvm-readobj -r %t.so | FileCheck -check-prefix=REL %s
 
 # REQUIRES: mips
 

Modified: lld/trunk/test/ELF/mips-merge-abiflags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-merge-abiflags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-merge-abiflags.s (original)
+++ lld/trunk/test/ELF/mips-merge-abiflags.s Tue Apr 30 22:49:01 2019
@@ -4,8 +4,8 @@
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-freebsd %s -o %t.o
 # RUN: ld.lld %t.o %p/Inputs/mips-concatenated-abiflags.o -o %t.exe
-# RUN: llvm-readobj -sections -mips-abi-flags %t.exe | FileCheck %s
-# RUN: llvm-readobj -sections -mips-abi-flags \
+# RUN: llvm-readobj --sections --mips-abi-flags %t.exe | FileCheck %s
+# RUN: llvm-readobj --sections --mips-abi-flags \
 # RUN:     %p/Inputs/mips-concatenated-abiflags.o | \
 # RUN:   FileCheck --check-prefix=INPUT-OBJECT %s
 

Modified: lld/trunk/test/ELF/mips-mgot.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-mgot.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-mgot.s (original)
+++ lld/trunk/test/ELF/mips-mgot.s Tue Apr 30 22:49:01 2019
@@ -8,7 +8,7 @@
 # RUN:         %p/Inputs/mips-mgot-2.s -o %t2.o
 # RUN: ld.lld -shared -mips-got-size 52 %t0.o %t1.o %t2.o -o %t.so
 # RUN: llvm-objdump -s -section=.got -t %t.so | FileCheck %s
-# RUN: llvm-readobj -r -dt -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+# RUN: llvm-readobj -r --dyn-syms --mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
 
 # CHECK:      Contents of section .got:
 # CHECK-NEXT:  70000 00000000 80000000 00010000 00010030

Modified: lld/trunk/test/ELF/mips-micro-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-micro-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-micro-got.s (original)
+++ lld/trunk/test/ELF/mips-micro-got.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:         %S/Inputs/mips-dynamic.s -o %t2.o
 # RUN: ld.lld %t2.o -shared -o %t.so
 # RUN: ld.lld %t1.o %t.so -o %t.exe
-# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Local entries [
 # CHECK-NEXT:   Entry {

Modified: lld/trunk/test/ELF/mips-micro-jal.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-micro-jal.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-micro-jal.s (original)
+++ lld/trunk/test/ELF/mips-micro-jal.s Tue Apr 30 22:49:01 2019
@@ -8,7 +8,7 @@
 # RUN:         -mattr=micromips %s -o %t2eb.o
 # RUN: ld.lld -o %teb.exe %t2eb.o %teb.so
 # RUN: llvm-objdump -d -mattr=micromips %teb.exe | FileCheck --check-prefix=EB %s
-# RUN: llvm-readobj -mips-plt-got %teb.exe | FileCheck --check-prefix=PLT %s
+# RUN: llvm-readobj --mips-plt-got %teb.exe | FileCheck --check-prefix=PLT %s
 
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux \
 # RUN:         -mattr=micromips %S/Inputs/mips-micro.s -o %t1el.o
@@ -17,7 +17,7 @@
 # RUN:         -mattr=micromips %s -o %t2el.o
 # RUN: ld.lld -o %tel.exe %t2el.o %tel.so
 # RUN: llvm-objdump -d -mattr=micromips %tel.exe | FileCheck --check-prefix=EL %s
-# RUN: llvm-readobj -mips-plt-got %tel.exe | FileCheck --check-prefix=PLT %s
+# RUN: llvm-readobj --mips-plt-got %tel.exe | FileCheck --check-prefix=PLT %s
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mattr=micromips -mcpu=mips32r6 %S/Inputs/mips-micro.s -o %t1eb.o

Modified: lld/trunk/test/ELF/mips-micro-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-micro-plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-micro-plt.s (original)
+++ lld/trunk/test/ELF/mips-micro-plt.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         -mattr=micromips %s -o %t-exe.o
 # RUN: ld.lld %t-exe.o %t.so -o %t.exe
-# RUN: llvm-readobj -t -dt -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --symbols --dyn-syms --mips-plt-got %t.exe | FileCheck %s
 # RUN: llvm-objdump -d -mattr=micromips %t.exe | FileCheck --check-prefix=ASM %s
 
 # CHECK:      Symbols [

Modified: lld/trunk/test/ELF/mips-non-zero-gp0.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-non-zero-gp0.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-non-zero-gp0.s (original)
+++ lld/trunk/test/ELF/mips-non-zero-gp0.s Tue Apr 30 22:49:01 2019
@@ -34,11 +34,11 @@
 #   lui     $gp,%hi(%neg(%gp_rel(foo)))
 
 # RUN: ld.lld -r -o %t-32.r %S/Inputs/mips-gp0-non-zero.o
-# RUN: llvm-readobj -mips-reginfo %t-32.r | FileCheck --check-prefix=GPVAL %s
+# RUN: llvm-readobj --mips-reginfo %t-32.r | FileCheck --check-prefix=GPVAL %s
 # RUN: llvm-objdump -s %t-32.r | FileCheck --check-prefix=ADDEND32 %s
 
 # RUN: ld.lld -r -o %t-64.r %S/Inputs/mips-n64-gp0-non-zero.o
-# RUN: llvm-readobj -mips-options %t-64.r | FileCheck --check-prefix=GPVAL %s
+# RUN: llvm-readobj --mips-options %t-64.r | FileCheck --check-prefix=GPVAL %s
 # RUN: llvm-readobj -r %S/Inputs/mips-n64-gp0-non-zero.o %t-64.r \
 # RUN:   | FileCheck --check-prefix=ADDEND64 %s
 

Modified: lld/trunk/test/ELF/mips-options-r.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-options-r.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-options-r.test (original)
+++ lld/trunk/test/ELF/mips-options-r.test Tue Apr 30 22:49:01 2019
@@ -11,7 +11,7 @@
 # % as -mabi=64 -mips64r2 t.s
 
 # RUN: ld.lld -r %p/Inputs/mips-options.o -o %t.o
-# RUN: llvm-readobj -s %t.o | FileCheck %s
+# RUN: llvm-readobj -S %t.o | FileCheck %s
 
 # REQUIRES: mips
 

Modified: lld/trunk/test/ELF/mips-options.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-options.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-options.s (original)
+++ lld/trunk/test/ELF/mips-options.s Tue Apr 30 22:49:01 2019
@@ -8,7 +8,7 @@
 # RUN:          . = 0x100000000; \
 # RUN:          .got  : { *(.got) } }" > %t.rel.script
 # RUN: ld.lld %t1.o %t2.o --gc-sections --script %t.rel.script -shared -o %t.so
-# RUN: llvm-readobj -program-headers -symbols -mips-options %t.so | FileCheck %s
+# RUN: llvm-readobj -l --symbols --mips-options %t.so | FileCheck %s
 
   .text
   .globl  __start

Modified: lld/trunk/test/ELF/mips-plt-copy.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-plt-copy.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-plt-copy.s (original)
+++ lld/trunk/test/ELF/mips-plt-copy.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:         %S/Inputs/mips-dynamic.s -o %t.so.o
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rel.dyn {

Modified: lld/trunk/test/ELF/mips-reginfo.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-reginfo.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-reginfo.s (original)
+++ lld/trunk/test/ELF/mips-reginfo.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         %S/Inputs/mips-dynamic.s -o %t2.o
 # RUN: ld.lld %t1.o %t2.o --gc-sections -shared -o %t.so
-# RUN: llvm-readobj -symbols -mips-reginfo %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols --mips-reginfo %t.so | FileCheck %s
 
   .text
   .globl  __start

Modified: lld/trunk/test/ELF/mips-sto-pic-flag.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-sto-pic-flag.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-sto-pic-flag.s (original)
+++ lld/trunk/test/ELF/mips-sto-pic-flag.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:   %p/Inputs/mips-pic.s -o %t-pic.o
 # RUN: ld.lld -r %t-npic.o %t-pic.o -o %t-rel.o
-# RUN: llvm-readobj -t %t-rel.o | FileCheck %s
+# RUN: llvm-readobj --symbols %t-rel.o | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: main

Modified: lld/trunk/test/ELF/mips-sto-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-sto-plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-sto-plt.s (original)
+++ lld/trunk/test/ELF/mips-sto-plt.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dt -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj --dyn-syms --mips-plt-got %t.exe | FileCheck %s
 
 # CHECK:      Symbol {
 # CHECK:        Name: foo0

Modified: lld/trunk/test/ELF/mips-tls-64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-tls-64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-tls-64.s (original)
+++ lld/trunk/test/ELF/mips-tls-64.s Tue Apr 30 22:49:01 2019
@@ -8,11 +8,11 @@
 
 # RUN: ld.lld %t.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -s -t %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # RUN: ld.lld -shared %t.o %t.so -o %t-out.so
 # RUN: llvm-objdump -d -s -t %t-out.so | FileCheck -check-prefix=DIS-SO %s
-# RUN: llvm-readobj -r -mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -r --mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
 
 # DIS:      __start:
 # DIS-NEXT:    20000:   24 62 80 30   addiu   $2, $3, -32720

Modified: lld/trunk/test/ELF/mips-tls-hilo.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-tls-hilo.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-tls-hilo.s (original)
+++ lld/trunk/test/ELF/mips-tls-hilo.s Tue Apr 30 22:49:01 2019
@@ -5,10 +5,10 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.exe
 # RUN: llvm-objdump -d -t %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # RUN: ld.lld %t.o -shared -o %t.so
-# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -r --mips-plt-got %t.so | FileCheck -check-prefix=SO %s
 
 # DIS:      __start:
 # DIS-NEXT:    20000:   24 62 00 00   addiu   $2, $3, 0

Modified: lld/trunk/test/ELF/mips-tls.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-tls.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/mips-tls.s (original)
+++ lld/trunk/test/ELF/mips-tls.s Tue Apr 30 22:49:01 2019
@@ -8,11 +8,11 @@
 
 # RUN: ld.lld %t.o %t.so -o %t.exe
 # RUN: llvm-objdump -d -s -t %t.exe | FileCheck -check-prefix=DIS %s
-# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck %s
+# RUN: llvm-readobj -r --mips-plt-got %t.exe | FileCheck %s
 
 # RUN: ld.lld -shared %t.o %t.so -o %t-out.so
 # RUN: llvm-objdump -d -s -t %t-out.so | FileCheck -check-prefix=DIS-SO %s
-# RUN: llvm-readobj -r -mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
+# RUN: llvm-readobj -r --mips-plt-got %t-out.so | FileCheck -check-prefix=SO %s
 
 # DIS:      __start:
 # DIS-NEXT:    20000:   24 62 80 20   addiu   $2, $3, -32736

Modified: lld/trunk/test/ELF/no-discard-this_module.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/no-discard-this_module.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/no-discard-this_module.s (original)
+++ lld/trunk/test/ELF/no-discard-this_module.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-linux-gnu -save-temp-labels %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -s -sd -t %t2 | FileCheck %s
+// RUN: llvm-readobj -S --section-data --symbols %t2 | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/noplt-pie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/noplt-pie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/noplt-pie.s (original)
+++ lld/trunk/test/ELF/noplt-pie.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: ld.lld --hash-style=sysv %t1.o %t2.so -o %t.out
-# RUN: llvm-readobj -s -r %t.out | FileCheck %s
+# RUN: llvm-readobj -S -r %t.out | FileCheck %s
 
 # CHECK: Section {
 # CHECK-NOT: Name: .plt

Modified: lld/trunk/test/ELF/note-contiguous.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/note-contiguous.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/note-contiguous.s (original)
+++ lld/trunk/test/ELF/note-contiguous.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // RUN: ld.lld %t.o -o %t1
-// RUN: llvm-readobj -program-headers %t1 | FileCheck %s
+// RUN: llvm-readobj -l %t1 | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset:
@@ -18,7 +18,7 @@
 
 // RUN: echo "SECTIONS { .note : { *(.note.a) *(.note.b) } }" > %t.script
 // RUN: ld.lld %t.o --script %t.script -o %t2
-// RUN: llvm-readobj -program-headers %t2 | FileCheck -check-prefix=SCRIPT %s
+// RUN: llvm-readobj -l %t2 | FileCheck -check-prefix=SCRIPT %s
 
 // SCRIPT:      Type: PT_NOTE
 // SCRIPT-NEXT: Offset:

Modified: lld/trunk/test/ELF/note-loadaddr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/note-loadaddr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/note-loadaddr.s (original)
+++ lld/trunk/test/ELF/note-loadaddr.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 // RUN:  .note.b : AT(0x2000) { *(.note.b) } \
 // RUN: }" > %t.script
 // RUN: ld.lld %t.o --script %t.script -o %t
-// RUN: llvm-readobj -program-headers %t | FileCheck %s
+// RUN: llvm-readobj -l %t | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset: 0x1000

Modified: lld/trunk/test/ELF/note-multiple.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/note-multiple.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/note-multiple.s (original)
+++ lld/trunk/test/ELF/note-multiple.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 // RUN:  .note.d : { *(.note.d) } \
 // RUN: }" > %t.script
 // RUN: ld.lld %t.o --script %t.script -o %t
-// RUN: llvm-readobj -program-headers %t | FileCheck %s
+// RUN: llvm-readobj -l %t | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset: 0x1000

Modified: lld/trunk/test/ELF/note-noalloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/note-noalloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/note-noalloc.s (original)
+++ lld/trunk/test/ELF/note-noalloc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t -shared
-// RUN: llvm-readobj -program-headers -sections %t | FileCheck %s
+// RUN: llvm-readobj -l --sections %t | FileCheck %s
 
 // PR37361: A note without SHF_ALLOC should not be included into a PT_NOTE program header.
 

Modified: lld/trunk/test/ELF/note-noalloc2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/note-noalloc2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/note-noalloc2.s (original)
+++ lld/trunk/test/ELF/note-noalloc2.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t
-# RUN: llvm-readobj -program-headers %t | FileCheck %s
+# RUN: llvm-readobj -l %t | FileCheck %s
 
 ## Check we do not create a PT_NOTE segment for non-allocatable note section.
 

Modified: lld/trunk/test/ELF/note.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/note.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/note.s (original)
+++ lld/trunk/test/ELF/note.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t -shared
-// RUN: llvm-readobj -program-headers %t | FileCheck %s
+// RUN: llvm-readobj -l %t | FileCheck %s
 
 // CHECK:      Type: PT_NOTE
 // CHECK-NEXT: Offset:

Modified: lld/trunk/test/ELF/output-section.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/output-section.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/output-section.s (original)
+++ lld/trunk/test/ELF/output-section.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -t %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols %t2 | FileCheck %s
 
 // CHECK:      Symbol {
 // CHECK:        Name: bar_sym

Modified: lld/trunk/test/ELF/pack-dyn-relocs-loop.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pack-dyn-relocs-loop.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pack-dyn-relocs-loop.s (original)
+++ lld/trunk/test/ELF/pack-dyn-relocs-loop.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-android %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so --pack-dyn-relocs=android -z norelro
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 // This test is making sure the Android packed relocation support doesn't
 // cause an infinite loop due to the size of the section oscillating

Modified: lld/trunk/test/ELF/pack-dyn-relocs-tls-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pack-dyn-relocs-tls-aarch64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pack-dyn-relocs-tls-aarch64.s (original)
+++ lld/trunk/test/ELF/pack-dyn-relocs-tls-aarch64.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared --pack-dyn-relocs=android %t.o -o %t.so
-// RUN: llvm-readobj -relocations %t.so | FileCheck %s
+// RUN: llvm-readobj -r %t.so | FileCheck %s
 
 // Bug 37841: Symbol::getVA must work on TLS symbols during the layout loop in
 // finalizeSections.

Modified: lld/trunk/test/ELF/pack-dyn-relocs-tls-x86-64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pack-dyn-relocs-tls-x86-64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pack-dyn-relocs-tls-x86-64.s (original)
+++ lld/trunk/test/ELF/pack-dyn-relocs-tls-x86-64.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld -shared --pack-dyn-relocs=android %t.o -o %t.so
-// RUN: llvm-readobj -relocations %t.so | FileCheck %s
+// RUN: llvm-readobj -r %t.so | FileCheck %s
 
 // Bug 37841: Symbol::getVA must work on TLS symbols during the layout loop in
 // finalizeSections. This test uses an atypical IE access in a shared object to

Modified: lld/trunk/test/ELF/pack-dyn-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pack-dyn-relocs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pack-dyn-relocs.s (original)
+++ lld/trunk/test/ELF/pack-dyn-relocs.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 // RUN: ld.lld -shared %t.a32.so.o -o %t.a32.so
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.a32
 // RUN: ld.lld -pie --pack-dyn-relocs=none %t.a32 %t.a32.so -o %t2.a32
-// RUN: llvm-readobj -relocations %t2.a32 | FileCheck --check-prefix=UNPACKED32 %s
+// RUN: llvm-readobj -r %t2.a32 | FileCheck --check-prefix=UNPACKED32 %s
 
 // Unpacked should have the relative relocations in their natural order.
 // UNPACKED32:          Section ({{.+}}) .rel.dyn {
@@ -41,8 +41,8 @@
 // UNPACKED32-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=android %t.a32 %t.a32.so -o %t3.a32
-// RUN: llvm-readobj -s -dynamic-table %t3.a32 | FileCheck --check-prefix=ANDROID32-HEADERS %s
-// RUN: llvm-readobj -relocations %t3.a32 | FileCheck --check-prefix=ANDROID32 %s
+// RUN: llvm-readobj -S --dynamic-table %t3.a32 | FileCheck --check-prefix=ANDROID32-HEADERS %s
+// RUN: llvm-readobj -r %t3.a32 | FileCheck --check-prefix=ANDROID32 %s
 
 // ANDROID32-HEADERS:       Index: 1
 // ANDROID32-HEADERS-NEXT:  Name: .dynsym
@@ -99,9 +99,9 @@
 // ANDROID32-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.a32 %t.a32.so -o %t4.a32
-// RUN: llvm-readobj -s -dynamic-table %t4.a32 | FileCheck --check-prefix=RELR32-HEADERS %s
-// RUN: llvm-readobj -relocations -raw-relr %t4.a32 | FileCheck --check-prefix=RAW-RELR32 %s
-// RUN: llvm-readobj -relocations %t4.a32 | FileCheck --check-prefix=RELR32 %s
+// RUN: llvm-readobj -S --dynamic-table %t4.a32 | FileCheck --check-prefix=RELR32-HEADERS %s
+// RUN: llvm-readobj -r --raw-relr %t4.a32 | FileCheck --check-prefix=RAW-RELR32 %s
+// RUN: llvm-readobj -r %t4.a32 | FileCheck --check-prefix=RELR32 %s
 
 // RELR32-HEADERS:       Index: 1
 // RELR32-HEADERS-NEXT:  Name: .dynsym
@@ -171,7 +171,7 @@
 // RUN: ld.lld -shared %t.a64.so.o -o %t.a64.so
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.a64
 // RUN: ld.lld -pie --pack-dyn-relocs=none %t.a64 %t.a64.so -o %t2.a64
-// RUN: llvm-readobj -relocations %t2.a64 | FileCheck --check-prefix=UNPACKED64 %s
+// RUN: llvm-readobj -r %t2.a64 | FileCheck --check-prefix=UNPACKED64 %s
 
 // UNPACKED64:          Section ({{.+}}) .rela.dyn {
 // UNPACKED64-NEXT:     0x20000 R_AARCH64_RELATIVE - 0x1
@@ -207,8 +207,8 @@
 // UNPACKED64-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=android %t.a64 %t.a64.so -o %t3.a64
-// RUN: llvm-readobj -s -dynamic-table %t3.a64 | FileCheck --check-prefix=ANDROID64-HEADERS %s
-// RUN: llvm-readobj -relocations %t3.a64 | FileCheck --check-prefix=ANDROID64 %s
+// RUN: llvm-readobj -S --dynamic-table %t3.a64 | FileCheck --check-prefix=ANDROID64-HEADERS %s
+// RUN: llvm-readobj -r %t3.a64 | FileCheck --check-prefix=ANDROID64 %s
 
 // ANDROID64-HEADERS:       Index: 1
 // ANDROID64-HEADERS-NEXT:  Name: .dynsym
@@ -263,9 +263,9 @@
 // ANDROID64-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.a64 %t.a64.so -o %t4.a64
-// RUN: llvm-readobj -s -dynamic-table %t4.a64 | FileCheck --check-prefix=RELR64-HEADERS %s
-// RUN: llvm-readobj -relocations -raw-relr %t4.a64 | FileCheck --check-prefix=RAW-RELR64 %s
-// RUN: llvm-readobj -relocations %t4.a64 | FileCheck --check-prefix=RELR64 %s
+// RUN: llvm-readobj -S --dynamic-table %t4.a64 | FileCheck --check-prefix=RELR64-HEADERS %s
+// RUN: llvm-readobj -r --raw-relr %t4.a64 | FileCheck --check-prefix=RAW-RELR64 %s
+// RUN: llvm-readobj -r %t4.a64 | FileCheck --check-prefix=RELR64 %s
 
 // RELR64-HEADERS:       Index: 1
 // RELR64-HEADERS-NEXT:  Name: .dynsym

Modified: lld/trunk/test/ELF/pack-dyn-relocs2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pack-dyn-relocs2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pack-dyn-relocs2.s (original)
+++ lld/trunk/test/ELF/pack-dyn-relocs2.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.o %t.so -o %t.exe
-// RUN: llvm-readobj -relocations %t.exe | FileCheck %s
+// RUN: llvm-readobj -r %t.exe | FileCheck %s
 
 // CHECK:      Section (5) .relr.dyn {
 // CHECK-NEXT:   0x2000 R_ARM_RELATIVE - 0x0
@@ -44,7 +44,7 @@
 // CHECK-NEXT:   0x2084 R_ARM_RELATIVE - 0x0
 // CHECK-NEXT: }
 
-// RUN: llvm-readobj -s -dynamic-table %t.exe | FileCheck --check-prefix=HEADER %s
+// RUN: llvm-readobj -S --dynamic-table %t.exe | FileCheck --check-prefix=HEADER %s
 // HEADER: 0x00000023 RELRSZ 0xC
 
 .data

Modified: lld/trunk/test/ELF/phdr-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/phdr-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/phdr-align.s (original)
+++ lld/trunk/test/ELF/phdr-align.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 # RUN:  .data : { *(.data) } \
 # RUN:  .text : { *(.text) } }" > %t.script
 # RUN: ld.lld %t.o --script %t.script -o %t
-# RUN: llvm-readobj -sections -symbols %t | FileCheck %s
+# RUN: llvm-readobj --sections --symbols %t | FileCheck %s
 
 # CHECK:      Sections [
 # CHECK-NEXT:  Section {

Modified: lld/trunk/test/ELF/pie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pie.s (original)
+++ lld/trunk/test/ELF/pie.s Tue Apr 30 22:49:01 2019
@@ -3,16 +3,16 @@
 
 ## Default is no PIE.
 # RUN: ld.lld %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t \
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t \
 # RUN:   | FileCheck %s --check-prefix=NOPIE
 
 ## Check -pie.
 # RUN: ld.lld -pie %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 
 ## Test --pic-executable alias
 # RUN: ld.lld --pic-executable %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 
 # CHECK:      ElfHeader {
 # CHECK-NEXT:  Ident {
@@ -49,9 +49,9 @@
 
 ## Check -nopie
 # RUN: ld.lld -no-pie %t1.o -o %t2
-# RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
+# RUN: llvm-readobj --file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
 # RUN: ld.lld -no-pic-executable %t1.o -o %t2
-# RUN: llvm-readobj -file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
+# RUN: llvm-readobj --file-headers -r %t2 | FileCheck %s --check-prefix=NOPIE
 # NOPIE-NOT: Type: SharedObject
 
 .globl _start

Modified: lld/trunk/test/ELF/plt-aarch64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/plt-aarch64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/plt-aarch64.s (original)
+++ lld/trunk/test/ELF/plt-aarch64.s Tue Apr 30 22:49:01 2019
@@ -4,10 +4,10 @@
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -shared %t.o %t2.so -o %t.so
 // RUN: ld.lld %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -s -r %t.so | FileCheck --check-prefix=CHECKDSO %s
+// RUN: llvm-readobj -S -r %t.so | FileCheck --check-prefix=CHECKDSO %s
 // RUN: llvm-objdump -s -section=.got.plt %t.so | FileCheck --check-prefix=DUMPDSO %s
 // RUN: llvm-objdump -d %t.so | FileCheck --check-prefix=DISASMDSO %s
-// RUN: llvm-readobj -s -r %t.exe | FileCheck --check-prefix=CHECKEXE %s
+// RUN: llvm-readobj -S -r %t.exe | FileCheck --check-prefix=CHECKEXE %s
 // RUN: llvm-objdump -s -section=.got.plt %t.exe | FileCheck --check-prefix=DUMPEXE %s
 // RUN: llvm-objdump -d %t.exe | FileCheck --check-prefix=DISASMEXE %s
 

Modified: lld/trunk/test/ELF/plt-i686.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/plt-i686.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/plt-i686.s (original)
+++ lld/trunk/test/ELF/plt-i686.s Tue Apr 30 22:49:01 2019
@@ -3,10 +3,10 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r %t | FileCheck %s
+// RUN: llvm-readobj -S -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // RUN: ld.lld -shared %t.o %t2.so -o %t
-// RUN: llvm-readobj -s -r %t | FileCheck --check-prefix=CHECKSHARED %s
+// RUN: llvm-readobj -S -r %t | FileCheck --check-prefix=CHECKSHARED %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASMSHARED %s
 // RUN: ld.lld -pie %t.o %t2.so -o %t
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASMPIE %s

Modified: lld/trunk/test/ELF/plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/plt.s (original)
+++ lld/trunk/test/ELF/plt.s Tue Apr 30 22:49:01 2019
@@ -4,9 +4,9 @@
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -shared %t.o %t2.so -o %t
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r %t | FileCheck %s
+// RUN: llvm-readobj -S -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
-// RUN: llvm-readobj -s -r %t3 | FileCheck --check-prefix=CHECK2 %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck --check-prefix=CHECK2 %s
 // RUN: llvm-objdump -d %t3 | FileCheck --check-prefix=DISASM2 %s
 
 // CHECK:      Name: .plt

Modified: lld/trunk/test/ELF/ppc64-dynamic-relocations.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-dynamic-relocations.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-dynamic-relocations.s (original)
+++ lld/trunk/test/ELF/ppc64-dynamic-relocations.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+// RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 // RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=DIS %s
 // RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
 
@@ -12,7 +12,7 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+// RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 // RUN: llvm-objdump --section-headers %t | FileCheck --check-prefix=DIS %s
 // RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
 

Modified: lld/trunk/test/ELF/ppc64-got-indirect.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-got-indirect.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-got-indirect.s (original)
+++ lld/trunk/test/ELF/ppc64-got-indirect.s Tue Apr 30 22:49:01 2019
@@ -1,13 +1,13 @@
 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-LE %s
+# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOCS-LE %s
 # RUN: ld.lld %t.o -o %t2
 # RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=CHECK-LE
 # RUN: llvm-objdump -D %t2 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-BE %s
+# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOCS-BE %s
 # RUN: ld.lld %t.o -o %t2
 # RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=CHECK-BE
 # RUN: llvm-objdump -D %t2 | FileCheck %s

Modified: lld/trunk/test/ELF/ppc64-toc-rel.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-toc-rel.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-toc-rel.s (original)
+++ lld/trunk/test/ELF/ppc64-toc-rel.s Tue Apr 30 22:49:01 2019
@@ -1,14 +1,14 @@
 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-LE %s
+# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOCS-LE %s
 # RUN: ld.lld %t.o -o %t
 # RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
 # RUN: llvm-readelf -x .got %t | FileCheck --check-prefix=HEX-LE %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-BE %s
+# RUN: llvm-readobj -r %t.o | FileCheck -check-prefix=RELOCS-BE %s
 # RUN: ld.lld %t.o -o %t
 # RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
 # RUN: llvm-readelf -x .got %t | FileCheck --check-prefix=HEX-BE %s

Modified: lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s (original)
+++ lld/trunk/test/ELF/ppc64-weak-undef-call-shared.s Tue Apr 30 22:49:01 2019
@@ -2,11 +2,11 @@
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
-# RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 # RUN: ld.lld -shared %t.o -o %t.so
-# RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 .section        ".toc","aw"
 .quad weakfunc

Modified: lld/trunk/test/ELF/pr36475.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pr36475.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pr36475.s (original)
+++ lld/trunk/test/ELF/pr36475.s Tue Apr 30 22:49:01 2019
@@ -10,7 +10,7 @@
 # RUN: echo " .got.plt : { BYTE(42); *(.got); } : ph_data" >> %t.script
 # RUN: echo "}" >> %t.script
 # RUN: ld.lld -T %t.script %t.o -o %t.elf
-# RUN: llvm-readobj -l -elf-output-style=GNU %t.elf | FileCheck %s
+# RUN: llvm-readobj -l --elf-output-style=GNU %t.elf | FileCheck %s
 
 # CHECK: Section to Segment mapping:
 # CHECK-NEXT: Segment Sections...

Modified: lld/trunk/test/ELF/pre_init_fini_array.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/pre_init_fini_array.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/pre_init_fini_array.s (original)
+++ lld/trunk/test/ELF/pre_init_fini_array.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2
 // RUN: ld.lld %t2 -o %t2.so -shared
 // RUN: ld.lld %t %t2.so -o %t2
-// RUN: llvm-readobj -r -symbols -sections -dynamic-table %t2 | FileCheck %s
+// RUN: llvm-readobj -r --symbols --sections --dynamic-table %t2 | FileCheck %s
 // RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM %s
 
 .globl _start

Modified: lld/trunk/test/ELF/progname.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/progname.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/progname.s (original)
+++ lld/trunk/test/ELF/progname.s Tue Apr 30 22:49:01 2019
@@ -4,18 +4,18 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t2.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -o %t %t.o %t2.so
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // RUN: echo "VER_1 { global: bar; };" > %t.script
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux \
 // RUN:   %p/Inputs/progname-ver.s -o %t-ver.o
 // RUN: ld.lld -shared -o %t.so -version-script %t.script %t-ver.o
 // RUN: ld.lld -o %t %t.o %t.so
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // RUN: echo "{ _start; };" > %t.dynlist
 // RUN: ld.lld -dynamic-list %t.dynlist -o %t %t.o %t.so
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // CHECK:      Name:     __progname
 // CHECK-NEXT: Value:    0x201000

Modified: lld/trunk/test/ELF/program-header-layout.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/program-header-layout.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/program-header-layout.s (original)
+++ lld/trunk/test/ELF/program-header-layout.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-readobj -sections -program-headers %t2 | FileCheck %s
+# RUN: llvm-readobj --sections -l %t2 | FileCheck %s
 
 # Check that different output sections with the same flags are merged into a
 # single Read/Write PT_LOAD.

Modified: lld/trunk/test/ELF/protected-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/protected-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/protected-shared.s (original)
+++ lld/trunk/test/ELF/protected-shared.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/protected-shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
-// RUN: llvm-readobj -t --dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-symbols %t | FileCheck %s
 
         .global  _start
 _start:

Modified: lld/trunk/test/ELF/push-state.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/push-state.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/push-state.s (original)
+++ lld/trunk/test/ELF/push-state.s Tue Apr 30 22:49:01 2019
@@ -19,11 +19,11 @@
 // RUN: ld.lld -shared %t3.o -soname libfoo -o %t.so
 
 // RUN: ld.lld -o %t.exe -push-state -as-needed %t.so %t1.o
-// RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=AS-NEEDED %s
+// RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=AS-NEEDED %s
 // AS-NEEDED-NOT: NEEDED Shared library: [libfoo]
 
 // RUN: ld.lld -o %t.exe -push-state -as-needed -pop-state %t.so %t1.o
-// RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=NO-AS-NEEDED %s
+// RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=NO-AS-NEEDED %s
 // NO-AS-NEEDED: NEEDED Shared library: [libfoo]
 
 

Modified: lld/trunk/test/ELF/rel-addend-with-rela-input.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/rel-addend-with-rela-input.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/rel-addend-with-rela-input.s (original)
+++ lld/trunk/test/ELF/rel-addend-with-rela-input.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # uses Elf_Rela
 
 # RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t-rela.o
-# RUN: llvm-readobj -h -s -section-data -relocations %t-rela.o | FileCheck -check-prefix INPUT-RELA %s
+# RUN: llvm-readobj -h -S --section-data -r %t-rela.o | FileCheck -check-prefix INPUT-RELA %s
 # INPUT-RELA:  ElfHeader {
 # INPUT-RELA:     Class: 64-bit
 # INPUT-RELA:     DataEncoding: BigEndian
@@ -21,7 +21,7 @@
 # Previously the addend to the dynamic relocation in the .data section was not copied if
 # the input file used RELA and the output uses REL. Check that it works now:
 # RUN: ld.lld -shared -o %t.so %t-rela.o  -verbose
-# RUN: llvm-readobj -h -s -section-data -relocations %t.so | FileCheck -check-prefix RELA-TO-REL %s
+# RUN: llvm-readobj -h -S --section-data -r %t.so | FileCheck -check-prefix RELA-TO-REL %s
 # RELA-TO-REL:  ElfHeader {
 # RELA-TO-REL:    Class: 64-bit
 # RELA-TO-REL:    DataEncoding: BigEndian

Modified: lld/trunk/test/ELF/relative-dynamic-reloc-pie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relative-dynamic-reloc-pie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relative-dynamic-reloc-pie.s (original)
+++ lld/trunk/test/ELF/relative-dynamic-reloc-pie.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -pie %t.o -o %t.pie
-# RUN: llvm-readobj -r -dyn-symbols %t.pie | FileCheck %s
+# RUN: llvm-readobj -r --dyn-syms %t.pie | FileCheck %s
 
 ## Test that we create R_X86_64_RELATIVE relocations with -pie.
 # CHECK:      Relocations [

Modified: lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s (original)
+++ lld/trunk/test/ELF/relative-dynamic-reloc-ppc64.s Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 // REQUIRES: ppc
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 // Test that we create R_PPC64_RELATIVE relocations but don't put any
 // symbols in the dynamic symbol table.

Modified: lld/trunk/test/ELF/relative-dynamic-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relative-dynamic-reloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relative-dynamic-reloc.s (original)
+++ lld/trunk/test/ELF/relative-dynamic-reloc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
-// RUN: llvm-readobj -t -r -dyn-symbols %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols -r --dyn-syms %t.so | FileCheck %s
 
 // Test that we create R_X86_64_RELATIVE relocations but don't put any
 // symbols in the dynamic symbol table.

Modified: lld/trunk/test/ELF/relocatable-bss.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-bss.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-bss.s (original)
+++ lld/trunk/test/ELF/relocatable-bss.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 
 ## We check here that .bss does not occupy the space in file.
 ## If it would, the SectionHeaderOffset would have offset about 5 megabytes.

Modified: lld/trunk/test/ELF/relocatable-comdat-multiple.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-comdat-multiple.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-comdat-multiple.s (original)
+++ lld/trunk/test/ELF/relocatable-comdat-multiple.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/relocatable-comdat-multiple.s -o %t2.o
 # RUN: ld.lld -r %t.o %t2.o -o %t
-# RUN: llvm-readobj -elf-section-groups %t | FileCheck %s
+# RUN: llvm-readobj --elf-section-groups %t | FileCheck %s
 
 # CHECK:      Groups {
 # CHECK-NEXT:   Group {

Modified: lld/trunk/test/ELF/relocatable-comdat.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-comdat.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-comdat.s (original)
+++ lld/trunk/test/ELF/relocatable-comdat.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -r %t.o %t.o -o %t
-# RUN: llvm-readobj -elf-section-groups -sections %t | FileCheck %s
+# RUN: llvm-readobj --elf-section-groups --sections %t | FileCheck %s
 
 # CHECK:        Name: .text.bar
 # CHECK-NEXT:   Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/relocatable-comdat2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-comdat2.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-comdat2.s (original)
+++ lld/trunk/test/ELF/relocatable-comdat2.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -r %t.o -o %t
-# RUN: llvm-readobj -elf-section-groups -s %t | FileCheck %s
+# RUN: llvm-readobj --elf-section-groups -S %t | FileCheck %s
 
 ## Check .foo was not merged.
 # CHECK: Sections [

Modified: lld/trunk/test/ELF/relocatable-comment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-comment.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-comment.s (original)
+++ lld/trunk/test/ELF/relocatable-comment.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Name: .comment
 # CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/relocatable-common.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-common.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-common.s (original)
+++ lld/trunk/test/ELF/relocatable-common.s Tue Apr 30 22:49:01 2019
@@ -1,17 +1,17 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck %s
 # RUN: ld.lld -r --no-define-common %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck %s
 # RUN: ld.lld -r --define-common %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 # RUN: ld.lld -r -d %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 # RUN: ld.lld -r -dc %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 # RUN: ld.lld -r -dp %t1.o -o %t
-# RUN: llvm-readobj -symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
+# RUN: llvm-readobj --symbols -r %t | FileCheck -check-prefix=DEFCOMM %s
 
 # CHECK:        Symbol {
 # CHECK:          Name: common

Modified: lld/trunk/test/ELF/relocatable-compressed-input.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-compressed-input.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-compressed-input.s (original)
+++ lld/trunk/test/ELF/relocatable-compressed-input.s Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 # REQUIRES: x86, zlib
 
 # RUN: llvm-mc -compress-debug-sections=zlib-gnu -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
-# RUN: llvm-readobj -sections %t1 | FileCheck -check-prefix=GNU %s
+# RUN: llvm-readobj --sections %t1 | FileCheck -check-prefix=GNU %s
 # GNU: Name: .zdebug_str
 
 # RUN: ld.lld %t1 -o %t2 -r
-# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s
 
 ## Check we uncompress section and remove ".z" prefix specific for zlib-gnu compression.
 # CHECK:      Section {

Modified: lld/trunk/test/ELF/relocatable-eh-frame-hdr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-eh-frame-hdr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-eh-frame-hdr.s (original)
+++ lld/trunk/test/ELF/relocatable-eh-frame-hdr.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --eh-frame-hdr -r %t.o -o %t
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:       Sections [
 # CHECK-NOT:    Name: .eh_frame_hdr

Modified: lld/trunk/test/ELF/relocatable-ehframe.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-ehframe.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-ehframe.s (original)
+++ lld/trunk/test/ELF/relocatable-ehframe.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/relocatable-ehframe.s -o %t2.o
 # RUN: ld.lld -r %t1.o %t2.o -o %t
-# RUN: llvm-readobj -r -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -r -S --section-data %t | FileCheck %s
 
 # CHECK:      Name: .strtab
 # CHECK-NEXT: Type: SHT_STRTAB

Modified: lld/trunk/test/ELF/relocatable-empty-archive.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-empty-archive.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-empty-archive.s (original)
+++ lld/trunk/test/ELF/relocatable-empty-archive.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: rm -f %t.a
 # RUN: llvm-ar rc %t.a
 # RUN: ld.lld -m elf_x86_64 %t.a -o %t -r
-# RUN: llvm-readobj -file-headers %t | FileCheck %s
+# RUN: llvm-readobj --file-headers %t | FileCheck %s
 
 # CHECK: Format: ELF64-x86-64
 # CHECK: Arch: x86_64

Modified: lld/trunk/test/ELF/relocatable-many-sections.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-many-sections.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-many-sections.s (original)
+++ lld/trunk/test/ELF/relocatable-many-sections.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 
 ## Check we emit a valid ELF header when
 ## sections amount is greater than SHN_LORESERVE.
-# RUN: llvm-readobj -file-headers %t | FileCheck %s --check-prefix=HDR
+# RUN: llvm-readobj --file-headers %t | FileCheck %s --check-prefix=HDR
 # HDR:      ElfHeader {
 # HDR:        SectionHeaderCount: 0 (65544)
 # HDR-NEXT:   StringTableSectionIndex: 65535 (65542)

Modified: lld/trunk/test/ELF/relocatable-rel-iplt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-rel-iplt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-rel-iplt.s (original)
+++ lld/trunk/test/ELF/relocatable-rel-iplt.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=i686-- %s -o %t1.o
 # RUN: ld.lld -r %t1.o -o %t2.o
-# RUN: llvm-readobj -t %t2.o | FileCheck %s
+# RUN: llvm-readobj --symbols %t2.o | FileCheck %s
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/relocatable-script.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-script.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-script.s (original)
+++ lld/trunk/test/ELF/relocatable-script.s Tue Apr 30 22:49:01 2019
@@ -2,6 +2,6 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux -o %t1.o %s
 # RUN: echo "SECTIONS { .foo : { BYTE(0x0) } }" > %t.script
 # RUN: ld.lld -r %t1.o -script %t.script -o %t2.o
-# RUN: llvm-readobj -sections %t2.o | FileCheck %s
+# RUN: llvm-readobj --sections %t2.o | FileCheck %s
 
 # CHECK:  Name: .foo

Modified: lld/trunk/test/ELF/relocatable-section-symbol.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-section-symbol.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-section-symbol.s (original)
+++ lld/trunk/test/ELF/relocatable-section-symbol.s Tue Apr 30 22:49:01 2019
@@ -13,7 +13,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 # RUN: ld.lld -r -o %t %t.o %t.o
-# RUN: llvm-readobj -r -s -section-data %t | FileCheck --check-prefix=REL %s
+# RUN: llvm-readobj -r -S --section-data %t | FileCheck --check-prefix=REL %s
 
 
 # REL:      Section {

Modified: lld/trunk/test/ELF/relocatable-symbol-name.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-symbol-name.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-symbol-name.s (original)
+++ lld/trunk/test/ELF/relocatable-symbol-name.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -r %t.o -o %t
-# RUN: llvm-readobj -t %t | FileCheck %s
+# RUN: llvm-readobj --symbols %t | FileCheck %s
 
 # Test that the section symbol has st_name equal to zero. GNU objdump
 # requires this to print relocations against the section.

Modified: lld/trunk/test/ELF/relocatable-symbols.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-symbols.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-symbols.s (original)
+++ lld/trunk/test/ELF/relocatable-symbols.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: ld.lld -r %t -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s
 # RUN: llvm-readobj -r %t | FileCheck -check-prefix=RELOC %s
-# RUN: llvm-readobj -symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
+# RUN: llvm-readobj --symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
 
 # DISASM:      _start:
 # DISASM-NEXT:   0: {{.*}} callq 0

Modified: lld/trunk/test/ELF/relocatable-visibility.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable-visibility.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable-visibility.s (original)
+++ lld/trunk/test/ELF/relocatable-visibility.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld -r %t.o -o %t1
-# RUN: llvm-readobj -t %t1 | FileCheck --check-prefix=RELOCATABLE %s
+# RUN: llvm-readobj --symbols %t1 | FileCheck --check-prefix=RELOCATABLE %s
 
 # RELOCATABLE:      Name: foo
 # RELOCATABLE-NEXT: Value: 0x0

Modified: lld/trunk/test/ELF/relocatable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocatable.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocatable.s (original)
+++ lld/trunk/test/ELF/relocatable.s Tue Apr 30 22:49:01 2019
@@ -3,18 +3,18 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/relocatable.s -o %t2.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/relocatable2.s -o %t3.o
 # RUN: ld.lld -r %t1.o %t2.o %t3.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 # RUN: llvm-objdump -section-headers %t | FileCheck -check-prefix=SECTION %s
 # RUN: llvm-objdump -s -d %t | FileCheck -check-prefix=CHECKTEXT %s
 
 ## Test --relocatable alias
 # RUN: ld.lld --relocatable %t1.o %t2.o %t3.o -o %t
-# RUN: llvm-readobj -file-headers -sections -program-headers -symbols -r %t | FileCheck %s
+# RUN: llvm-readobj --file-headers --sections -l --symbols -r %t | FileCheck %s
 # RUN: llvm-objdump -s -d %t | FileCheck -check-prefix=CHECKTEXT %s
 
 ## Verify that we can use our relocation output as input to produce executable
 # RUN: ld.lld -e main %t -o %texec
-# RUN: llvm-readobj -file-headers %texec | FileCheck -check-prefix=CHECKEXE %s
+# RUN: llvm-readobj --file-headers %texec | FileCheck -check-prefix=CHECKEXE %s
 
 # CHECK:       ElfHeader {
 # CHECK-NEXT:  Ident {

Modified: lld/trunk/test/ELF/relocation-copy-align-common.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-copy-align-common.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-copy-align-common.s (original)
+++ lld/trunk/test/ELF/relocation-copy-align-common.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN:   %p/Inputs/relocation-copy-align-common.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t.so
 # RUN: ld.lld --hash-style=sysv %t.o %t.so -o %t3
-# RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+# RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 
 # CHECK:      Section {
 # CHECK:        Index:

Modified: lld/trunk/test/ELF/relocation-copy-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-copy-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-copy-align.s (original)
+++ lld/trunk/test/ELF/relocation-copy-align.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy-align.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld %t.o %t.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/relocation-copy-flags.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-copy-flags.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-copy-flags.s (original)
+++ lld/trunk/test/ELF/relocation-copy-flags.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -s -section-data -r %t.exe | FileCheck %s
+// RUN: llvm-readobj -S --section-data -r %t.exe | FileCheck %s
 
         .global _start
 _start:

Modified: lld/trunk/test/ELF/relocation-copy-i686.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-copy-i686.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-copy-i686.s (original)
+++ lld/trunk/test/ELF/relocation-copy-i686.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld -e main %t.o %t.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=CODE %s
 
 .text

Modified: lld/trunk/test/ELF/relocation-copy-relro.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-copy-relro.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-copy-relro.s (original)
+++ lld/trunk/test/ELF/relocation-copy-relro.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy-relro.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld --hash-style=sysv %t.o %t.so -o %t3
-// RUN: llvm-readobj -program-headers -s -r %t3 | FileCheck %s
+// RUN: llvm-readobj -l -S -r %t3 | FileCheck %s
 
 // CHECK:        Name: .bss.rel.ro (48)
 // CHECK-NEXT:   Type: SHT_NOBITS (0x8)

Modified: lld/trunk/test/ELF/relocation-copy.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-copy.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-copy.s (original)
+++ lld/trunk/test/ELF/relocation-copy.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/relocation-copy.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t.so
 // RUN: ld.lld %t.o %t.so -o %t3
-// RUN: llvm-readobj -s -r --expand-relocs %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r --expand-relocs %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck -check-prefix=CODE %s
 
 .text

Modified: lld/trunk/test/ELF/relocation-group.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-group.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-group.test (original)
+++ lld/trunk/test/ELF/relocation-group.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o %t.o -o %t -r
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:     Name: .text.foo
 # CHECK:     Name: .rela.text.foo

Modified: lld/trunk/test/ELF/relocation-i686.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-i686.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-i686.s (original)
+++ lld/trunk/test/ELF/relocation-i686.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv %t %t2.so -o %t2
-// RUN: llvm-readobj -s %t2 | FileCheck --check-prefix=ADDR %s
+// RUN: llvm-readobj -S %t2 | FileCheck --check-prefix=ADDR %s
 // RUN: llvm-objdump -d %t2 | FileCheck %s
 
 .global _start

Modified: lld/trunk/test/ELF/relocation-non-alloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-non-alloc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-non-alloc.s (original)
+++ lld/trunk/test/ELF/relocation-non-alloc.s Tue Apr 30 22:49:01 2019
@@ -2,12 +2,12 @@
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t2 -shared --apply-dynamic-relocs
-// RUN: llvm-readobj -s -section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
+// RUN: llvm-readobj -S --section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix APPLYDYNREL %s
 
 // RUN: ld.lld %t -o %t2 -shared
-// RUN: llvm-readobj -s -section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -S --section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 // RUN: ld.lld %t -o %t2 -shared --no-apply-dynamic-relocs
-// RUN: llvm-readobj -s -section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
+// RUN: llvm-readobj -S --section-data -r %t2 | FileCheck -check-prefix CHECK -check-prefix NOAPPLYDYNREL %s
 
 // APPLYDYNREL:      Name: .data
 // APPLYDYNREL-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/relocation-relative-synthetic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-relative-synthetic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-relative-synthetic.s (original)
+++ lld/trunk/test/ELF/relocation-relative-synthetic.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t -pie
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
 # CHECK-NEXT: }

Modified: lld/trunk/test/ELF/relocation-relative-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-relative-weak.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-relative-weak.s (original)
+++ lld/trunk/test/ELF/relocation-relative-weak.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: ld.lld %t1.o -shared -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o %t1.so -o %t -pie
-# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+# RUN: llvm-readobj --dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
 # CHECK-NEXT:   0x3018 R_X86_64_JUMP_SLOT w 0x0

Modified: lld/trunk/test/ELF/relocation-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-shared.s (original)
+++ lld/trunk/test/ELF/relocation-shared.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -shared -o %t.so
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
 // CHECK:      Name: foo
 // CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/relocation-undefined-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-undefined-weak.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation-undefined-weak.s (original)
+++ lld/trunk/test/ELF/relocation-undefined-weak.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -sections %tout | FileCheck %s
+// RUN: llvm-readobj --sections %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix DISASM
 
 // Check that undefined weak symbols are treated as having a VA of 0.

Modified: lld/trunk/test/ELF/relocation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relocation.s (original)
+++ lld/trunk/test/ELF/relocation.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t2
 // RUN: ld.lld %t2 -soname fixed-length-string.so -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t %t2.so -o %t3
-// RUN: llvm-readobj -s  %t3 | FileCheck --check-prefix=SEC %s
+// RUN: llvm-readobj -S  %t3 | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -s -d %t3 | FileCheck %s
 
 // SEC:      Name: .plt

Modified: lld/trunk/test/ELF/relro-tls.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relro-tls.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/relro-tls.s (original)
+++ lld/trunk/test/ELF/relro-tls.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -program-headers %tout | FileCheck %s
+// RUN: llvm-readobj -l %tout | FileCheck %s
 
 // CHECK:      Type: PT_GNU_RELRO
 // CHECK-NEXT: Offset:

Modified: lld/trunk/test/ELF/resolution-end.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/resolution-end.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/resolution-end.s (original)
+++ lld/trunk/test/ELF/resolution-end.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution-end.s -o %t2.o
 # RUN: ld.lld -shared -o %t2.so %t2.o
 # RUN: ld.lld --hash-style=sysv %t1.o %t2.so -o %t
-# RUN: llvm-readobj -t -s -section-data  %t | FileCheck %s
+# RUN: llvm-readobj --symbols -S --section-data  %t | FileCheck %s
 
 # Test that we resolve _end to the this executable.
 

Modified: lld/trunk/test/ELF/resolution-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/resolution-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/resolution-shared.s (original)
+++ lld/trunk/test/ELF/resolution-shared.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution-shared.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t3 -shared
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
         .weak foo
 foo:

Modified: lld/trunk/test/ELF/resolution.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/resolution.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/resolution.s (original)
+++ lld/trunk/test/ELF/resolution.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/resolution.s -o %t2
 // RUN: ld.lld -discard-all %t %t2 -o %t3
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 // This is an exhaustive test for checking which symbol is kept when two
 // have the same name. Each symbol has a different size which is used

Modified: lld/trunk/test/ELF/rodynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/rodynamic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/rodynamic.s (original)
+++ lld/trunk/test/ELF/rodynamic.s Tue Apr 30 22:49:01 2019
@@ -4,13 +4,13 @@
 
 # RUN: ld.lld -shared %t.so.o -o %t.so
 # RUN: ld.lld %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=DEFDEBUG %s
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=DEFSEC %s
+# RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=DEFDEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=DEFSEC %s
 
 # RUN: ld.lld -shared -z rodynamic %t.so.o -o %t.so
 # RUN: ld.lld -z rodynamic %t.o %t.so -o %t.exe
-# RUN: llvm-readobj -dynamic-table %t.exe | FileCheck -check-prefix=RODEBUG %s
-# RUN: llvm-readobj -sections %t.exe | FileCheck -check-prefix=ROSEC %s
+# RUN: llvm-readobj --dynamic-table %t.exe | FileCheck -check-prefix=RODEBUG %s
+# RUN: llvm-readobj --sections %t.exe | FileCheck -check-prefix=ROSEC %s
 
 .globl _start
 _start:

Modified: lld/trunk/test/ELF/section-layout.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/section-layout.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/section-layout.s (original)
+++ lld/trunk/test/ELF/section-layout.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %tout
-# RUN: llvm-readobj -sections %tout | FileCheck %s
+# RUN: llvm-readobj --sections %tout | FileCheck %s
 
 # Check that sections are laid out in the correct order.
 

Modified: lld/trunk/test/ELF/section-symbol.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/section-symbol.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/section-symbol.s (original)
+++ lld/trunk/test/ELF/section-symbol.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %t.so -shared -discard-none
-// RUN: llvm-readobj -t %t.so | FileCheck %s
+// RUN: llvm-readobj --symbols %t.so | FileCheck %s
 
 // Test that we don't include the section symbols from the .o in the .so
 

Modified: lld/trunk/test/ELF/shared-ppc64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/shared-ppc64.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/shared-ppc64.s (original)
+++ lld/trunk/test/ELF/shared-ppc64.s Tue Apr 30 22:49:01 2019
@@ -4,13 +4,13 @@
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -dynamic-linker /lib64/ld64.so.1 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
-// RUN: llvm-readobj --dynamic-table -s %t | FileCheck %s
+// RUN: llvm-readobj --dynamic-table -S %t | FileCheck %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -dynamic-linker /lib64/ld64.so.1 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
-// RUN: llvm-readobj --dynamic-table -s %t | FileCheck %s
+// RUN: llvm-readobj --dynamic-table -S %t | FileCheck %s
 
 // CHECK:      Name: .rela.dyn
 // CHECK-NEXT: Type: SHT_REL

Modified: lld/trunk/test/ELF/shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/shared.s (original)
+++ lld/trunk/test/ELF/shared.s Tue Apr 30 22:49:01 2019
@@ -2,11 +2,11 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld --hash-style=sysv -shared %t2.o -o %t2.so
-// RUN: llvm-readobj -s %t2.so | FileCheck --check-prefix=SO %s
+// RUN: llvm-readobj -S %t2.so | FileCheck --check-prefix=SO %s
 // RUN: ld.lld --hash-style=sysv -dynamic-linker /lib64/ld-linux-x86-64.so.2 -rpath foo -rpath bar --export-dynamic %t.o %t2.so -o %t
-// RUN: llvm-readobj --program-headers --dynamic-table -t -s -dyn-symbols -section-data -hash-table %t | FileCheck %s
+// RUN: llvm-readobj --program-headers --dynamic-table --symbols -S --dyn-syms --section-data --hash-table %t | FileCheck %s
 // RUN: ld.lld --hash-style=sysv %t.o %t2.so %t2.so -o %t2
-// RUN: llvm-readobj -dyn-symbols %t2 | FileCheck --check-prefix=DONT_EXPORT %s
+// RUN: llvm-readobj --dyn-syms %t2 | FileCheck --check-prefix=DONT_EXPORT %s
 
 // Make sure .symtab is properly aligned.
 // SO:      Name: .symtab

Modified: lld/trunk/test/ELF/shf-info-link.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/shf-info-link.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/shf-info-link.test (original)
+++ lld/trunk/test/ELF/shf-info-link.test Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: yaml2obj %S/Inputs/shf-info-link.test  -o %t2.o
 # RUN: ld.lld %t.o %t2.o -o %t3.o -r
-# RUN: llvm-readobj -s %t3.o | FileCheck %s
+# RUN: llvm-readobj -S %t3.o | FileCheck %s
 
 # CHECK-NOT: Name: .rela.text
 # CHECK:     Name: .rela.text

Modified: lld/trunk/test/ELF/sht-group-empty.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/sht-group-empty.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/sht-group-empty.test (original)
+++ lld/trunk/test/ELF/sht-group-empty.test Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s -o %t.o
 # RUN: ld.lld %t.o %t.o -o %t -r
-# RUN: llvm-readobj -s %t | FileCheck %s
+# RUN: llvm-readobj -S %t | FileCheck %s
 
 # CHECK:     Name: .text.foo
 # CHECK:     Name: .rela.text.foo

Modified: lld/trunk/test/ELF/start-lib-comdat.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/start-lib-comdat.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/start-lib-comdat.s (original)
+++ lld/trunk/test/ELF/start-lib-comdat.s Tue Apr 30 22:49:01 2019
@@ -4,9 +4,9 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux \
 // RUN:   %p/Inputs/start-lib-comdat.s -o %t2.o
 // RUN: ld.lld -shared -o %t3 %t1.o --start-lib %t2.o --end-lib
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 // RUN: ld.lld -shared -o %t3 --start-lib %t2.o --end-lib %t1.o
-// RUN: llvm-readobj -t %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols %t3 | FileCheck %s
 
 // CHECK:      Name: zed
 // CHECK-NEXT: Value:

Modified: lld/trunk/test/ELF/startstop-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/startstop-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/startstop-shared.s (original)
+++ lld/trunk/test/ELF/startstop-shared.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -t %t.so | FileCheck  %s
+// RUN: llvm-readobj -r --symbols %t.so | FileCheck  %s
 
         .data
         .quad __start_foo

Modified: lld/trunk/test/ELF/startstop.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/startstop.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/startstop.s (original)
+++ lld/trunk/test/ELF/startstop.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv %t -o %tout -shared
 // RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s
-// RUN: llvm-readobj -symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
+// RUN: llvm-readobj --symbols -r %tout | FileCheck -check-prefix=SYMBOL %s
 
 // DISASM: _start:
 // DISASM:    1000:       {{.*}}  callq   10

Modified: lld/trunk/test/ELF/static-with-export-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/static-with-export-dynamic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/static-with-export-dynamic.s (original)
+++ lld/trunk/test/ELF/static-with-export-dynamic.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-cloudabi %s -o %t.o
 // RUN: ld.lld --export-dynamic %t.o -o %t
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // Ensure that a dynamic symbol table is present when --export-dynamic
 // is passed in, even when creating statically linked executables.

Modified: lld/trunk/test/ELF/string-gc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/string-gc.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/string-gc.s (original)
+++ lld/trunk/test/ELF/string-gc.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t --gc-sections
-// RUN: llvm-readobj -symbols %t | FileCheck %s
+// RUN: llvm-readobj --symbols %t | FileCheck %s
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/string-table.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/string-table.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/string-table.s (original)
+++ lld/trunk/test/ELF/string-table.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/strip-debug.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/strip-debug.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/strip-debug.s (original)
+++ lld/trunk/test/ELF/strip-debug.s Tue Apr 30 22:49:01 2019
@@ -1,11 +1,11 @@
 # REQUIRES: x86, zlib
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --strip-debug
-# RUN: llvm-readobj -sections %t2 | FileCheck %s
+# RUN: llvm-readobj --sections %t2 | FileCheck %s
 # RUN: ld.lld %t -o %t2 -S
-# RUN: llvm-readobj -sections %t2 | FileCheck %s
+# RUN: llvm-readobj --sections %t2 | FileCheck %s
 # RUN: ld.lld %t -o %t2 --strip-all
-# RUN: llvm-readobj -sections %t2 | FileCheck %s
+# RUN: llvm-readobj --sections %t2 | FileCheck %s
 
 # CHECK-NOT: Foo
 # CHECK-NOT: Bar

Modified: lld/trunk/test/ELF/symbol-override.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/symbol-override.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/symbol-override.s (original)
+++ lld/trunk/test/ELF/symbol-override.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/symbol-override.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t1.o %t2.so -o %t
-// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 // CHECK:      DynamicSymbols [
 // CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/symbols.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/symbols.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/symbols.s (original)
+++ lld/trunk/test/ELF/symbols.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
-// RUN: llvm-readobj -symbols -sections %t2 | FileCheck %s
+// RUN: llvm-readobj --symbols --sections %t2 | FileCheck %s
 
 .type _start, @function
 .globl _start

Modified: lld/trunk/test/ELF/sysv-hash-no-rosegment.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/sysv-hash-no-rosegment.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/sysv-hash-no-rosegment.s (original)
+++ lld/trunk/test/ELF/sysv-hash-no-rosegment.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --no-rosegment -o %t %t.o
-# RUN: llvm-readobj -hash-table %t | FileCheck %s
+# RUN: llvm-readobj --hash-table %t | FileCheck %s
 
 # CHECK:      HashTable {
 # CHECK-NEXT:   Num Buckets: 2

Modified: lld/trunk/test/ELF/tail-merge-string-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tail-merge-string-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tail-merge-string-align.s (original)
+++ lld/trunk/test/ELF/tail-merge-string-align.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared -O3
-// RUN: llvm-readobj -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -S --section-data %t.so | FileCheck %s
 
         .section        .rodata.4a,"aMS", at progbits,1
         .align 4

Modified: lld/trunk/test/ELF/tls-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-align.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-align.s (original)
+++ lld/trunk/test/ELF/tls-align.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout -shared
-// RUN: llvm-readobj -program-headers %tout | FileCheck %s
+// RUN: llvm-readobj -l %tout | FileCheck %s
 
         .section        .tbss,"awT", at nobits
         .align  8

Modified: lld/trunk/test/ELF/tls-dynamic-i686.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-dynamic-i686.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-dynamic-i686.s (original)
+++ lld/trunk/test/ELF/tls-dynamic-i686.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared -z norelro %t -o %tout
-// RUN: llvm-readobj -sections -relocations %tout | FileCheck %s
+// RUN: llvm-readobj --sections -r %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 
 .type tls0, at object

Modified: lld/trunk/test/ELF/tls-dynamic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-dynamic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-dynamic.s (original)
+++ lld/trunk/test/ELF/tls-dynamic.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld --hash-style=sysv -shared %t -o %tout
-// RUN: llvm-readobj -sections -relocations %tout | FileCheck %s
+// RUN: llvm-readobj --sections -r %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 
   leaq  a at tlsld(%rip), %rdi

Modified: lld/trunk/test/ELF/tls-got.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-got.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-got.s (original)
+++ lld/trunk/test/ELF/tls-got.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-got.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld --hash-style=sysv -e main %t1.o %t2.so -o %t3
-// RUN: llvm-readobj -s -r %t3 | FileCheck %s
+// RUN: llvm-readobj -S -r %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Section {

Modified: lld/trunk/test/ELF/tls-initial-exec-local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-initial-exec-local.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-initial-exec-local.s (original)
+++ lld/trunk/test/ELF/tls-initial-exec-local.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld --hash-style=sysv -shared %t.o -o %t
-// RUN: llvm-readobj -r -s %t | FileCheck %s
+// RUN: llvm-readobj -r -S %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .got

Modified: lld/trunk/test/ELF/tls-offset.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-offset.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-offset.s (original)
+++ lld/trunk/test/ELF/tls-offset.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -s %tout | FileCheck %s
+// RUN: llvm-readobj -S %tout | FileCheck %s
 // RUN: echo "SECTIONS { \
 // RUN:   . = 0x201000; \
 // RUN:   .text : { *(.text) } \
@@ -12,7 +12,7 @@
 // RUN: }" > %t.script
 // RUN: ld.lld -T %t.script %t -o %tout2
 // RUN: echo SCRIPT
-// RUN: llvm-readobj -s %tout2 | FileCheck %s
+// RUN: llvm-readobj -S %tout2 | FileCheck %s
         .global _start
 _start:
         retq

Modified: lld/trunk/test/ELF/tls-opt-gdie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-opt-gdie.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-opt-gdie.s (original)
+++ lld/trunk/test/ELF/tls-opt-gdie.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-opt-gdie.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %t.so
 // RUN: ld.lld --hash-style=sysv %t.o %t.so -o %t1
-// RUN: llvm-readobj -s -r %t1 | FileCheck --check-prefix=RELOC %s
+// RUN: llvm-readobj -S -r %t1 | FileCheck --check-prefix=RELOC %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 //RELOC:      Section {

Modified: lld/trunk/test/ELF/tls-opt-iele-i686-nopic.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-opt-iele-i686-nopic.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-opt-iele-i686-nopic.s (original)
+++ lld/trunk/test/ELF/tls-opt-iele-i686-nopic.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %p/Inputs/tls-opt-iele-i686-nopic.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %tso
 // RUN: ld.lld --hash-style=sysv %t.o %tso -o %t1
-// RUN: llvm-readobj -s -r %t1 | FileCheck --check-prefix=GOTREL %s
+// RUN: llvm-readobj -S -r %t1 | FileCheck --check-prefix=GOTREL %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 // GOTREL:      Section {

Modified: lld/trunk/test/ELF/tls-opt-no-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-opt-no-plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-opt-no-plt.s (original)
+++ lld/trunk/test/ELF/tls-opt-no-plt.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/tls-opt-gdie.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -s %t.exe | FileCheck %s
+// RUN: llvm-readobj -S %t.exe | FileCheck %s
 
 // CHECK-NOT: .plt
 

Modified: lld/trunk/test/ELF/tls-relocatable.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls-relocatable.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls-relocatable.s (original)
+++ lld/trunk/test/ELF/tls-relocatable.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -r -o %tr.o
 // RUN: ld.lld %tr.o -shared -o %t1
-// RUN: llvm-readobj -t %t1 | FileCheck %s
+// RUN: llvm-readobj --symbols %t1 | FileCheck %s
 
 // CHECK:       Symbol {
 // CHECK:         Name: tls0

Modified: lld/trunk/test/ELF/tls.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/tls.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/tls.s (original)
+++ lld/trunk/test/ELF/tls.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %tout
-// RUN: llvm-readobj -symbols -sections -program-headers %tout | FileCheck %s
+// RUN: llvm-readobj --symbols --sections -l %tout | FileCheck %s
 // RUN: llvm-objdump -d %tout | FileCheck %s --check-prefix=DIS
 
 .global _start

Modified: lld/trunk/test/ELF/ttext-tdata-tbss.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ttext-tdata-tbss.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ttext-tdata-tbss.s (original)
+++ lld/trunk/test/ELF/ttext-tdata-tbss.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 ## Show what regular output gives to us.
 # RUN: ld.lld %t.o -o %t1
-# RUN: llvm-readobj --elf-output-style=GNU -l -s  %t1 | FileCheck %s
+# RUN: llvm-readobj --elf-output-style=GNU -l -S  %t1 | FileCheck %s
 # CHECK:      .rodata   PROGBITS 0000000000200158 000158 000008
 # CHECK-NEXT: .text     PROGBITS 0000000000201000 001000 000001
 # CHECK-NEXT: .aw       PROGBITS 0000000000202000 002000 000008
@@ -15,7 +15,7 @@
 
 ## With .text at 0 there is no space to allocate the headers.
 # RUN: ld.lld -Ttext 0x0 -Tdata 0x4000 -Tbss 0x8000 %t.o -o %t2
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t2 | FileCheck %s --check-prefix=USER1
+# RUN: llvm-readobj --elf-output-style=GNU -l -S %t2 | FileCheck %s --check-prefix=USER1
 # USER1:      .text   PROGBITS 0000000000000000 001000 000001
 # USER1-NEXT: .data   PROGBITS 0000000000004000 002000 000008
 # USER1-NEXT: .bss    NOBITS   0000000000008000 002008 000008
@@ -26,7 +26,7 @@
 
 ## With .text at 0x1000 there is space to allocate the headers.
 # RUN: ld.lld -Ttext 0x1000 -Tdata 0x4000 -Tbss 0x8000 %t.o -o %t3
-# RUN: llvm-readobj --elf-output-style=GNU -l -s  %t3 | FileCheck %s --check-prefix=USER2
+# RUN: llvm-readobj --elf-output-style=GNU -l -S  %t3 | FileCheck %s --check-prefix=USER2
 # USER2:      .text   PROGBITS 0000000000001000 001000 000001
 # USER2-NEXT: .data   PROGBITS 0000000000004000 002000 000008
 # USER2-NEXT: .bss    NOBITS   0000000000008000 002008 000008
@@ -38,7 +38,7 @@
 
 ## With .text well above 200000 we don't need to change the image base
 # RUN: ld.lld -Ttext 0x201000 %t.o -o %t4
-# RUN: llvm-readobj --elf-output-style=GNU -l -s %t4 | FileCheck %s --check-prefix=USER3
+# RUN: llvm-readobj --elf-output-style=GNU -l -S %t4 | FileCheck %s --check-prefix=USER3
 # USER3:     .text   PROGBITS 0000000000201000 001000 000001
 # USER3-NEX: .rodata PROGBITS 0000000000202000 002000 000008
 # USER3-NEX: .aw     PROGBITS 0000000000203000 003000 000008

Modified: lld/trunk/test/ELF/undef-version-script.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef-version-script.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/undef-version-script.s (original)
+++ lld/trunk/test/ELF/undef-version-script.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "{ local: *; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/undef-with-plt-addr-i686.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef-with-plt-addr-i686.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/undef-with-plt-addr-i686.s (original)
+++ lld/trunk/test/ELF/undef-with-plt-addr-i686.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %p/Inputs/undef-with-plt-addr.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -t -s %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols -S %t3 | FileCheck %s
 
 .globl _start
 _start:

Modified: lld/trunk/test/ELF/undef-with-plt-addr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/undef-with-plt-addr.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/undef-with-plt-addr.s (original)
+++ lld/trunk/test/ELF/undef-with-plt-addr.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/undef-with-plt-addr.s -o %t2.o
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t3
-// RUN: llvm-readobj -t -s -r %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols -S -r %t3 | FileCheck %s
 
 // Test that -z nocopyreloc doesn't prevent the plt hack.
 // RUN: ld.lld %t.o %t2.so -o %t3 -z nocopyreloc

Modified: lld/trunk/test/ELF/verdef-defaultver.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/verdef-defaultver.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/verdef-defaultver.s (original)
+++ lld/trunk/test/ELF/verdef-defaultver.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: echo "V1 { global: a; local: *; };" > %t.script
 # RUN: echo "V2 { global: b; c; } V1;" >> %t.script
 # RUN: ld.lld --hash-style=sysv -shared -soname shared %t1 --version-script %t.script -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      DynamicSymbols [
 # DSO-NEXT:    Symbol {
@@ -108,7 +108,7 @@
 ## Check that we can link against DSO produced.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
 # RUN: ld.lld --hash-style=sysv %t2 %t.so -o %t3
-# RUN: llvm-readobj -V -dyn-symbols %t3 | FileCheck --check-prefix=EXE %s
+# RUN: llvm-readobj -V --dyn-syms %t3 | FileCheck --check-prefix=EXE %s
 
 # EXE:      DynamicSymbols [
 # EXE-NEXT:    Symbol {

Modified: lld/trunk/test/ELF/verdef-dependency.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/verdef-dependency.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/verdef-dependency.s (original)
+++ lld/trunk/test/ELF/verdef-dependency.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: echo "LIBSAMPLE_2.0 { global: b; local: *; } LIBSAMPLE_1.0;" >> %t.script
 # RUN: echo "LIBSAMPLE_3.0 { global: c; } LIBSAMPLE_2.0;" >> %t.script
 # RUN: ld.lld --version-script %t.script -shared -soname shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      SHT_GNU_verdef {
 # DSO-NEXT:   Definition {

Modified: lld/trunk/test/ELF/verdef.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/verdef.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/verdef.s (original)
+++ lld/trunk/test/ELF/verdef.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: echo "LIBSAMPLE_2.0 { global: b; local: *; };" >> %t.script
 # RUN: echo "LIBSAMPLE_3.0 { global: c; local: *; };" >> %t.script
 # RUN: ld.lld --hash-style=sysv --version-script %t.script -shared -soname shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:        Version symbols {
 # DSO-NEXT:   Section Name: .gnu.version
@@ -101,7 +101,7 @@
 # RUN: echo "LIBSAMPLE_3.0 { global: c; local: *; };" >> %t.script
 # RUN: echo "}" >> %t.script
 # RUN: ld.lld --hash-style=sysv --script %t.script -shared -soname shared %t.o -o %t2.so
-# RUN: llvm-readobj -V -dyn-symbols %t2.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t2.so | FileCheck --check-prefix=DSO %s
 
 .globl a
 .type  a, at function

Modified: lld/trunk/test/ELF/verneed.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/verneed.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/verneed.s (original)
+++ lld/trunk/test/ELF/verneed.s Tue Apr 30 22:49:01 2019
@@ -7,7 +7,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv %t.o %t1.so %t2.so -o %t
-# RUN: llvm-readobj -V -sections -section-data -dyn-symbols -dynamic-table %t | FileCheck %s
+# RUN: llvm-readobj -V --sections --section-data --dyn-syms --dynamic-table %t | FileCheck %s
 
 # CHECK:        Section {
 # CHECK:          Index: 1

Modified: lld/trunk/test/ELF/version-exclude-libs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-exclude-libs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-exclude-libs.s (original)
+++ lld/trunk/test/ELF/version-exclude-libs.s Tue Apr 30 22:49:01 2019
@@ -4,8 +4,8 @@
 // RUN: llvm-ar -r %t.a %t.o
 // RUN: llvm-mc %s -o %t2.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t2.o %t.a --shared --exclude-libs ALL -o %t.so
-// RUN: llvm-readobj -symbols %t.so | FileCheck %s
-// RUN: llvm-readobj -dyn-symbols %t.so | FileCheck -check-prefix CHECK-DYN %s
+// RUN: llvm-readobj --symbols %t.so | FileCheck %s
+// RUN: llvm-readobj --dyn-syms %t.so | FileCheck -check-prefix CHECK-DYN %s
 // RUN: not ld.lld %t2.o %t.a --shared -o %t.so 2>&1 | FileCheck -check-prefix=CHECK-ERR %s
 
 // Test that we do not give an error message for undefined versions when the

Modified: lld/trunk/test/ELF/version-script-anonymous-local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-anonymous-local.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-anonymous-local.s (original)
+++ lld/trunk/test/ELF/version-script-anonymous-local.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: echo "{ global: foo; local: bar; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols -t %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms --symbols %t.so | FileCheck %s
 
 # CHECK:      Symbols [
 # CHECK:          Name: bar

Modified: lld/trunk/test/ELF/version-script-copy-rel.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-copy-rel.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-copy-rel.s (original)
+++ lld/trunk/test/ELF/version-script-copy-rel.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: ld.lld --version-script %t.script -shared %t1.o -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
 # RUN: ld.lld %t2.o %t.so -o %tout
-# RUN: llvm-readobj -dyn-symbols %tout | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %tout | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK:        Symbol {

Modified: lld/trunk/test/ELF/version-script-extern-exact.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-extern-exact.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-extern-exact.s (original)
+++ lld/trunk/test/ELF/version-script-extern-exact.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: echo "FOO { global: extern \"C++\" { \"aaa*\"; }; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s --check-prefix=NOMATCH
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s --check-prefix=NOMATCH
 
 # NOMATCH:     DynamicSymbols [
 # NOMATCH-NOT:   _Z3aaaPf@@FOO
@@ -12,7 +12,7 @@
 
 # RUN: echo "FOO { global: extern \"C++\" { \"aaa*\"; aaa*; }; };" > %t2.script
 # RUN: ld.lld --version-script %t2.script -shared %t.o -o %t2.so
-# RUN: llvm-readobj -dyn-symbols %t2.so | FileCheck %s --check-prefix=MATCH
+# RUN: llvm-readobj --dyn-syms %t2.so | FileCheck %s --check-prefix=MATCH
 # MATCH:   DynamicSymbols [
 # MATCH:     _Z3aaaPf@@FOO
 # MATCH:     _Z3aaaPi@@FOO

Modified: lld/trunk/test/ELF/version-script-extern-wildcards-anon.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-extern-wildcards-anon.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-extern-wildcards-anon.s (original)
+++ lld/trunk/test/ELF/version-script-extern-wildcards-anon.s Tue Apr 30 22:49:01 2019
@@ -12,7 +12,7 @@
 # RUN:       local: *; \
 # RUN:       }; ' > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/version-script-extern-wildcards.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-extern-wildcards.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-extern-wildcards.s (original)
+++ lld/trunk/test/ELF/version-script-extern-wildcards.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: echo "FOO { global: extern \"C++\" { foo*; }; };" > %t.script
 # RUN: echo "BAR { global: extern \"C++\" { zed*; bar; }; };" >> %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck %s
 
 # CHECK:  Version symbols {
 # CHECK:   Symbols [

Modified: lld/trunk/test/ELF/version-script-extern.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-extern.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-extern.s (original)
+++ lld/trunk/test/ELF/version-script-extern.s Tue Apr 30 22:49:01 2019
@@ -8,7 +8,7 @@
 # RUN: echo '  extern "C" { _Z3bari; };' >> %t.script
 # RUN: echo "};" >> %t.script
 # RUN: ld.lld --hash-style=sysv --version-script %t.script -soname fixed-length-string -shared %t.o -o %t.so
-# RUN: llvm-readobj -V -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      DynamicSymbols [
 # DSO-NEXT:    Symbol {

Modified: lld/trunk/test/ELF/version-script-glob.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-glob.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-glob.s (original)
+++ lld/trunk/test/ELF/version-script-glob.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: echo "{ global: foo*; bar*; local: *; };" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld -shared --version-script %t.script %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
         .globl foo1
 foo1:

Modified: lld/trunk/test/ELF/version-script-hide-so-symbol.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-hide-so-symbol.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-hide-so-symbol.s (original)
+++ lld/trunk/test/ELF/version-script-hide-so-symbol.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN: ld.lld -shared %t.o -o %t2.so
 # RUN: echo "{ local: *; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # The symbol foo must be hidden. This matches bfd and gold and is
 # required to make it possible for a c++ library to hide its own

Modified: lld/trunk/test/ELF/version-script-locals.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-locals.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-locals.s (original)
+++ lld/trunk/test/ELF/version-script-locals.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 
 # RUN: echo "VERSION_1.0 { local: foo1; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=EXACT %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=EXACT %s
 # EXACT:  DynamicSymbols [
 # EXACT:      _start
 # EXACT-NOT:  foo1
@@ -12,7 +12,7 @@
 
 # RUN: echo "VERSION_1.0 { local: foo*; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=WC %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=WC %s
 # WC:  DynamicSymbols [
 # WC:      _start
 # WC-NOT:  foo1
@@ -21,7 +21,7 @@
 
 # RUN: echo "VERSION_1.0 { global: *; local: foo*; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=MIX %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=MIX %s
 # MIX:  DynamicSymbols [
 # MIX:      _start@@VERSION_1.0
 # MIX-NOT:  foo1

Modified: lld/trunk/test/ELF/version-script-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-weak.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script-weak.s (original)
+++ lld/trunk/test/ELF/version-script-weak.s Tue Apr 30 22:49:01 2019
@@ -6,7 +6,7 @@
 # RUN: llvm-ar rcs %t.a %tmp.o
 # RUN: echo "{ local: *; };" > %t.script
 # RUN: ld.lld -shared --version-script %t.script %t.o %t.a -o %t.so
-# RUN: llvm-readobj -dyn-symbols -r %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms -r %t.so | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rela.plt {

Modified: lld/trunk/test/ELF/version-script.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-script.s (original)
+++ lld/trunk/test/ELF/version-script.s Tue Apr 30 22:49:01 2019
@@ -6,19 +6,19 @@
 # RUN: echo "{ global: foo1; foo3; local: *; };" > %t.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --version-script %t.script -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=DSO %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # RUN: echo "# comment" > %t3.script
 # RUN: echo "{ local: *; # comment" >> %t3.script
 # RUN: echo -n "}; # comment" >> %t3.script
 # RUN: ld.lld --version-script %t3.script -shared %t.o %t2.so -o %t3.so
-# RUN: llvm-readobj -dyn-symbols %t3.so | FileCheck --check-prefix=DSO2 %s
+# RUN: llvm-readobj --dyn-syms %t3.so | FileCheck --check-prefix=DSO2 %s
 
 ## Also check that both "global:" and "global :" forms are accepted
 # RUN: echo "VERSION_1.0 { global : foo1; local : *; };" > %t4.script
 # RUN: echo "VERSION_2.0 { global: foo3; local: *; };" >> %t4.script
 # RUN: ld.lld --version-script %t4.script -shared %t.o %t2.so -o %t4.so
-# RUN: llvm-readobj -dyn-symbols %t4.so | FileCheck --check-prefix=VERDSO %s
+# RUN: llvm-readobj --dyn-syms %t4.so | FileCheck --check-prefix=VERDSO %s
 
 # RUN: echo "VERSION_1.0 { global: foo1; local: *; };" > %t5.script
 # RUN: echo "{ global: foo3; local: *; };" >> %t5.script
@@ -46,7 +46,7 @@
 # RUN: echo "VERSION_1.0 { global : foo1; local : *; };" > %t7a.script
 # RUN: echo "VERSION_2.0 { global: foo3; local: *; };" > %t7b.script
 # RUN: ld.lld --version-script %t7a.script --version-script %t7b.script -shared %t.o %t2.so -o %t7.so
-# RUN: llvm-readobj -dyn-symbols %t7.so | FileCheck --check-prefix=VERDSO %s
+# RUN: llvm-readobj --dyn-syms %t7.so | FileCheck --check-prefix=VERDSO %s
 
 # DSO:      DynamicSymbols [
 # DSO-NEXT:   Symbol {
@@ -149,12 +149,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=ALL %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=ALL %s
 
 # RUN: echo "{ global: foo1; foo3; };" > %t2.script
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld --hash-style=sysv --version-script %t2.script -shared %t.o %t2.so -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck --check-prefix=ALL %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck --check-prefix=ALL %s
 
 # ALL:      DynamicSymbols [
 # ALL-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/version-use.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-use.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-use.s (original)
+++ lld/trunk/test/ELF/version-use.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o %p/Inputs/version-use.so -o %t.so -shared -z defs
-// RUN: llvm-readobj -s %t.so | FileCheck %s
+// RUN: llvm-readobj -S %t.so | FileCheck %s
 
 
         call    bar at PLT

Modified: lld/trunk/test/ELF/version-wildcard.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-wildcard.test?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/version-wildcard.test (original)
+++ lld/trunk/test/ELF/version-wildcard.test Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "VERSION_1.0 { global: foo*; local: *; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK: DynamicSymbols [
 # CHECK-NEXT:   Symbol {
@@ -48,7 +48,7 @@
 # RUN: echo "VERSION_1.0 { global: foo2; local: *; };" > %t2.script
 # RUN: echo "VERSION_2.0 { global: foo*; };" >> %t2.script
 # RUN: ld.lld --version-script %t2.script -shared %t.o -o %t2.so
-# RUN: llvm-readobj -dyn-symbols %t2.so | FileCheck --check-prefix=MIX %s
+# RUN: llvm-readobj --dyn-syms %t2.so | FileCheck --check-prefix=MIX %s
 
 # MIX:      DynamicSymbols [
 # MIX-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/visibility.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/visibility.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/visibility.s (original)
+++ lld/trunk/test/ELF/visibility.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/visibility.s -o %t2
 // RUN: ld.lld -shared %t %t2 -o %t3
-// RUN: llvm-readobj -t -dyn-symbols %t3 | FileCheck %s
+// RUN: llvm-readobj --symbols --dyn-syms %t3 | FileCheck %s
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/weak-undef-export.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/weak-undef-export.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/weak-undef-export.s (original)
+++ lld/trunk/test/ELF/weak-undef-export.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld --export-dynamic %t.o -o %t
-# RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/weak-undef-hidden.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/weak-undef-hidden.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/weak-undef-hidden.s (original)
+++ lld/trunk/test/ELF/weak-undef-hidden.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
 .data
 .weak g

Modified: lld/trunk/test/ELF/weak-undef-lib.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/weak-undef-lib.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/weak-undef-lib.s (original)
+++ lld/trunk/test/ELF/weak-undef-lib.s Tue Apr 30 22:49:01 2019
@@ -4,7 +4,7 @@
 # RUN:   llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t2.o
 
 # RUN: ld.lld -shared -o %t.so %t1.o --start-lib %t2.o
-# RUN: llvm-readobj -dyn-symbols %t.so | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t.so | FileCheck %s
 
 # CHECK:      Name: foo
 # CHECK-NEXT: Value: 0x0

Modified: lld/trunk/test/ELF/weak-undef-no-shared-libs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/weak-undef-no-shared-libs.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/weak-undef-no-shared-libs.s (original)
+++ lld/trunk/test/ELF/weak-undef-no-shared-libs.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld -pie %t.o -o %t
-// RUN: llvm-readobj -V -dyn-symbols %t | FileCheck %s
+// RUN: llvm-readobj -V --dyn-syms %t | FileCheck %s
 
         .globl _start
 _start:

Modified: lld/trunk/test/ELF/weak-undef-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/weak-undef-shared.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/weak-undef-shared.s (original)
+++ lld/trunk/test/ELF/weak-undef-shared.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 // RUN: llvm-mc %p/Inputs/shared.s -o %t2.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t.exe
-// RUN: llvm-readobj -t %t.exe | FileCheck %s
+// RUN: llvm-readobj --symbols %t.exe | FileCheck %s
 
 // CHECK:      Name: bar
 // CHECK-NEXT: Value: 0x201020

Modified: lld/trunk/test/ELF/weak-undef-val.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/weak-undef-val.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/weak-undef-val.s (original)
+++ lld/trunk/test/ELF/weak-undef-val.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t --export-dynamic
-# RUN: llvm-readobj -s -section-data %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 
 # CHECK:      Name: .text
 # CHECK-NEXT: Type: SHT_PROGBITS

Modified: lld/trunk/test/ELF/weak-undef.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/weak-undef.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/weak-undef.s (original)
+++ lld/trunk/test/ELF/weak-undef.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: ld.lld %t1.o -shared -o %t1.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t %t1.so -pie
-# RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
+# RUN: llvm-readobj --dyn-syms %t | FileCheck %s
 
 # CHECK:      DynamicSymbols [
 # CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/ELF/wrap-dynamic-undef.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/wrap-dynamic-undef.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/wrap-dynamic-undef.s (original)
+++ lld/trunk/test/ELF/wrap-dynamic-undef.s Tue Apr 30 22:49:01 2019
@@ -3,7 +3,7 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/wrap-dynamic-undef.s -o %t2.o
 # RUN: ld.lld %t2.o -o %t2.so -shared
 # RUN: ld.lld %t1.o %t2.so -o %t --wrap foo
-# RUN: llvm-readobj -dyn-symbols --elf-output-style=GNU %t | FileCheck %s
+# RUN: llvm-readobj --dyn-syms --elf-output-style=GNU %t | FileCheck %s
 
 # Test that the dynamic relocation uses foo. We used to produce a
 # relocation with __real_foo.

Modified: lld/trunk/test/ELF/wrap-entry.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/wrap-entry.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/wrap-entry.s (original)
+++ lld/trunk/test/ELF/wrap-entry.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // RUN: ld.lld -o %t.exe %t.o -wrap=_start
-// RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
+// RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
 
 // CHECK: Entry: 0x201001
 

Modified: lld/trunk/test/ELF/wrap-plt.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/wrap-plt.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/wrap-plt.s (original)
+++ lld/trunk/test/ELF/wrap-plt.s Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 
 // RUN: ld.lld -o %t2 %t -wrap foo -shared
-// RUN: llvm-readobj -s -r %t2 | FileCheck %s
+// RUN: llvm-readobj -S -r %t2 | FileCheck %s
 // RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .plt

Modified: lld/trunk/test/ELF/wrap.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/wrap.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/wrap.s (original)
+++ lld/trunk/test/ELF/wrap.s Tue Apr 30 22:49:01 2019
@@ -14,7 +14,7 @@
 // CHECK-NEXT: movl $0x11010, %edx
 // CHECK-NEXT: movl $0x11000, %edx
 
-// RUN: llvm-readobj -t %t3 > %t4.dump
+// RUN: llvm-readobj --symbols %t3 > %t4.dump
 // RUN: FileCheck --check-prefix=SYM1 %s < %t4.dump
 // RUN: FileCheck --check-prefix=SYM2 %s < %t4.dump
 // RUN: FileCheck --check-prefix=SYM3 %s < %t4.dump

Modified: lld/trunk/test/ELF/x86-64-rela.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-rela.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-rela.s (original)
+++ lld/trunk/test/ELF/x86-64-rela.s Tue Apr 30 22:49:01 2019
@@ -1,10 +1,10 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -dynamic-table %t.so | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t.so | FileCheck %s
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux-gnux32 %s -o %t.o
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -dynamic-table %t.so | FileCheck %s
+// RUN: llvm-readobj --dynamic-table %t.so | FileCheck %s
 
         call foo at plt
 

Modified: lld/trunk/test/ELF/x86-64-static-tls-model.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-static-tls-model.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-static-tls-model.s (original)
+++ lld/trunk/test/ELF/x86-64-static-tls-model.s Tue Apr 30 22:49:01 2019
@@ -5,7 +5,7 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t1 -shared
-# RUN: llvm-readobj -dynamic-table %t1 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t1 | FileCheck %s
 
 # CHECK: DynamicSection [
 # CHECK: FLAGS STATIC_TLS

Modified: lld/trunk/test/ELF/x86-64-tls-gd-local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-tls-gd-local.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-tls-gd-local.s (original)
+++ lld/trunk/test/ELF/x86-64-tls-gd-local.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld --hash-style=sysv %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s -section-data %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S --section-data %t.so | FileCheck %s
 
         .byte   0x66
         leaq    foo at tlsgd(%rip), %rdi

Modified: lld/trunk/test/ELF/x86-64-tls-ld-local.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-tls-ld-local.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/x86-64-tls-ld-local.s (original)
+++ lld/trunk/test/ELF/x86-64-tls-ld-local.s Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t.o -o %t.so -shared
-// RUN: llvm-readobj -r -s %t.so | FileCheck %s
+// RUN: llvm-readobj -r -S %t.so | FileCheck %s
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {

Modified: lld/trunk/test/ELF/zstack-size.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/zstack-size.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/zstack-size.s (original)
+++ lld/trunk/test/ELF/zstack-size.s Tue Apr 30 22:49:01 2019
@@ -1,13 +1,13 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld -z stack-size=0x1000 %t -o %t1
-# RUN: llvm-readobj -program-headers %t1 | FileCheck %s -check-prefix=CHECK1
+# RUN: llvm-readobj -l %t1 | FileCheck %s -check-prefix=CHECK1
 
 # RUN: ld.lld -z stack-size=0 %t -o %t2
-# RUN: llvm-readobj -program-headers %t2 | FileCheck %s -check-prefix=CHECK2
+# RUN: llvm-readobj -l %t2 | FileCheck %s -check-prefix=CHECK2
 
 # RUN: ld.lld -z stack-size=0x2000 -z stack-size=0x1000 %t -o %t3
-# RUN: llvm-readobj -program-headers %t3 | FileCheck %s -check-prefix=CHECK1
+# RUN: llvm-readobj -l %t3 | FileCheck %s -check-prefix=CHECK1
 
 .global _start
 _start:

Modified: lld/trunk/test/ELF/ztext.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ztext.s?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/ELF/ztext.s (original)
+++ lld/trunk/test/ELF/ztext.s Tue Apr 30 22:49:01 2019
@@ -4,11 +4,11 @@
 # RUN: ld.lld %t2.o -o %t2.so -shared
 
 # RUN: ld.lld -z notext %t.o %t2.so -o %t -shared
-# RUN: llvm-readobj  -dynamic-table -r %t | FileCheck %s
+# RUN: llvm-readobj  --dynamic-table -r %t | FileCheck %s
 # RUN: ld.lld -z notext %t.o %t2.so -o %t2 -pie
-# RUN: llvm-readobj  -dynamic-table -r %t2 | FileCheck %s
+# RUN: llvm-readobj  --dynamic-table -r %t2 | FileCheck %s
 # RUN: ld.lld -z notext %t.o %t2.so -o %t3
-# RUN: llvm-readobj  -dynamic-table -r %t3 | FileCheck --check-prefix=STATIC %s
+# RUN: llvm-readobj  --dynamic-table -r %t3 | FileCheck --check-prefix=STATIC %s
 
 # RUN: not ld.lld %t.o %t2.so -o %t -shared 2>&1 | FileCheck --check-prefix=ERR %s
 # RUN: not ld.lld -z text %t.o %t2.so -o %t -shared 2>&1 | FileCheck --check-prefix=ERR %s

Modified: lld/trunk/test/mach-o/arm-interworking.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-interworking.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/arm-interworking.yaml (original)
+++ lld/trunk/test/mach-o/arm-interworking.yaml Tue Apr 30 22:49:01 2019
@@ -2,7 +2,7 @@
 # RUN: %p/Inputs/arm-interworking.yaml -o %t  | FileCheck %s \
 # RUN: && ld64.lld -arch armv7 -dylib -print_atoms \
 # RUN:         %p/Inputs/armv7/libSystem.yaml %t -o %t2  | FileCheck %s \
-# RUN: && llvm-readobj -s -sd %t2 | FileCheck -check-prefix=CODE %s
+# RUN: && llvm-readobj -S --section-data %t2 | FileCheck -check-prefix=CODE %s
 #
 # Test thumb and arm branches round trip through -r.
 # Test bl/blx instructions are fixed up properly.

Modified: lld/trunk/test/mach-o/arm-shims.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-shims.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/arm-shims.yaml (original)
+++ lld/trunk/test/mach-o/arm-shims.yaml Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: ld64.lld -arch armv7 %s %p/Inputs/arm-shims.yaml \
 # RUN: -dylib %p/Inputs/armv7/libSystem.yaml -o %t
-# RUN: llvm-readobj -s -sd %t | FileCheck %s
+# RUN: llvm-readobj -S --section-data %t | FileCheck %s
 #
 # Test b from arm to thumb or vice versa has shims added.s
 #

Modified: lld/trunk/test/mach-o/exe-offsets.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/exe-offsets.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/exe-offsets.yaml (original)
+++ lld/trunk/test/mach-o/exe-offsets.yaml Tue Apr 30 22:49:01 2019
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -arch x86_64 %s -o %t -e start %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-readobj -sections %t | FileCheck %s
+# RUN: llvm-readobj --sections %t | FileCheck %s
 
 # Make sure data gets put at offset
 

Modified: lld/trunk/test/mach-o/exe-segment-overlap.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/exe-segment-overlap.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/exe-segment-overlap.yaml (original)
+++ lld/trunk/test/mach-o/exe-segment-overlap.yaml Tue Apr 30 22:49:01 2019
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -arch x86_64 %s -o %t %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-readobj -sections -section-data %t | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t | FileCheck %s
 
 --- !native
 defined-atoms:

Modified: lld/trunk/test/mach-o/image-base.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/image-base.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/image-base.yaml (original)
+++ lld/trunk/test/mach-o/image-base.yaml Tue Apr 30 22:49:01 2019
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -arch x86_64 -macosx_version_min 10.9 %s -o %t -image_base 31415926000 %p/Inputs/x86_64/libSystem.yaml
-# RUN: llvm-readobj -macho-segment %t | FileCheck %s
+# RUN: llvm-readobj --macho-segment %t | FileCheck %s
 # RUN: not ld64.lld -arch x86_64 -image_base 0x31415926530 %s >/dev/null 2> %t
 # RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-MISPAGED
 # RUN: not ld64.lld -arch x86_64 -image_base 1000 %s >/dev/null 2> %t

Modified: lld/trunk/test/mach-o/sectalign.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/sectalign.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/sectalign.yaml (original)
+++ lld/trunk/test/mach-o/sectalign.yaml Tue Apr 30 22:49:01 2019
@@ -1,7 +1,7 @@
 # RUN: ld64.lld -arch x86_64 -macosx_version_min 10.8 %s -dylib \
 # RUN:    -sectalign __DATA __custom 0x800 -sectalign __TEXT __text 0x400 \
 # RUN:    %p/Inputs/x86_64/libSystem.yaml -o %t \
-# RUN: && llvm-readobj -sections %t | FileCheck %s
+# RUN: && llvm-readobj --sections %t | FileCheck %s
 #
 # Test -sectalign option on __text and a custom section.
 #

Modified: lld/trunk/test/mach-o/subsections-via-symbols-default.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/subsections-via-symbols-default.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/subsections-via-symbols-default.yaml (original)
+++ lld/trunk/test/mach-o/subsections-via-symbols-default.yaml Tue Apr 30 22:49:01 2019
@@ -1,5 +1,5 @@
 # RUN: ld64.lld -ios_simulator_version_min 5.0 -arch x86_64 -r %s -o %t
-# RUN: llvm-readobj -file-headers %t | FileCheck %s
+# RUN: llvm-readobj --file-headers %t | FileCheck %s
 
 # Make sure that we have an objc image info in the output.  It should have
 # been generated by the objc pass.

Modified: lld/trunk/test/mach-o/write-final-sections.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/write-final-sections.yaml?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/mach-o/write-final-sections.yaml (original)
+++ lld/trunk/test/mach-o/write-final-sections.yaml Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 # RUN: ld64.lld -arch x86_64 %s %p/Inputs/write-final-sections.yaml \
 # RUN: -o %t -e _foo
-# RUN: llvm-readobj -sections -section-data %t | FileCheck %s
+# RUN: llvm-readobj --sections --section-data %t | FileCheck %s
 
 --- !native
 defined-atoms:

Modified: lld/trunk/test/wasm/lto/relocatable.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/lto/relocatable.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/wasm/lto/relocatable.ll (original)
+++ lld/trunk/test/wasm/lto/relocatable.ll Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: wasm-ld %t1.o -r -o %t
-; RUN: llvm-readobj -symbols %t | FileCheck %s
+; RUN: llvm-readobj --symbols %t | FileCheck %s
 
 ; CHECK:      Symbols [
 ; CHECK-NEXT:   Symbol {

Modified: lld/trunk/test/wasm/lto/weak.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/lto/weak.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/wasm/lto/weak.ll (original)
+++ lld/trunk/test/wasm/lto/weak.ll Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: wasm-ld %t.o %t.o -o %t.wasm -r
-; RUN: llvm-readobj -t %t.wasm | FileCheck %s
+; RUN: llvm-readobj --symbols %t.wasm | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown-wasm"

Modified: lld/trunk/test/wasm/version.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/version.ll?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- lld/trunk/test/wasm/version.ll (original)
+++ lld/trunk/test/wasm/version.ll Tue Apr 30 22:49:01 2019
@@ -1,6 +1,6 @@
 ; RUN: llc -filetype=obj %s -o %t.o
 ; RUN: wasm-ld -o %t.wasm %t.o
-; RUN: llvm-readobj -file-headers %t.wasm | FileCheck %s
+; RUN: llvm-readobj --file-headers %t.wasm | FileCheck %s
 
 target triple = "wasm32-unknown-unknown"
 




More information about the llvm-commits mailing list