14 files changed, 40 insertions, 48 deletions
diff --git a/llvm/test/MC/ELF/exclude-debug-dwo.s b/llvm/test/MC/ELF/exclude-debug-dwo.s
index 02cdc0d3ff2..058ae848e27 100644
--- a/llvm/test/MC/ELF/exclude-debug-dwo.s
+++ b/llvm/test/MC/ELF/exclude-debug-dwo.s
@@ -1,5 +1,5 @@
 # RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o %t.o
-# RUN: llvm-readobj -S --elf-output-style=GNU %t.o | FileCheck %s
+# RUN: llvm-readelf -S %t.o | FileCheck %s
 
 ## Check we add SHF_EXCLUDE flag for .dwo debug sections.
 # CHECK: .debug_info.dwo        {{.*}} E
diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test
index b227407f414..8fecc7a146a 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test
@@ -11,7 +11,7 @@
 # RUN:   --globalize-symbol Global1 \
 # RUN:   --keep-global-symbol Global2 \
 # RUN:   %t.o %t.2.o
-# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.2.o | FileCheck %s
+# RUN: llvm-readelf --symbols %t.2.o | FileCheck %s
 
 !ELF
 FileHeader:
diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test
index 52707fc774f..cb4d9110578 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test
@@ -40,10 +40,10 @@
 # RUN:   -G Weak1 \
 # RUN:   --globalize-symbol Weak2 \
 # RUN:   %t.o %t.2.o
-# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.2.o | FileCheck %s
+# RUN: llvm-readelf --symbols %t.2.o | FileCheck %s
 
 # RUN: llvm-objcopy  --regex --keep-global-symbols %t-globals-regexp.txt %t.o %t.3.o
-# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.3.o | FileCheck %s --check-prefix=REGEXP
+# RUN: llvm-readelf --symbols %t.3.o | FileCheck %s --check-prefix=REGEXP
 
 !ELF
 FileHeader:
diff --git a/llvm/test/tools/llvm-readobj/broken-group.test b/llvm/test/tools/llvm-readobj/broken-group.test
index 3742fe237b6..23bd76a821e 100644
--- a/llvm/test/tools/llvm-readobj/broken-group.test
+++ b/llvm/test/tools/llvm-readobj/broken-group.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %s -o %t.o
 
-# RUN: llvm-readobj --elf-section-groups --elf-output-style=GNU \
+# RUN: llvm-readelf --elf-section-groups \
 # RUN:   %t.o >%tout.log 2>%terr.log
 # RUN: FileCheck %s -check-prefix=GNU-STDERR < %terr.log
 # GNU-STDERR: Error: section [    3] in group section [    4] already in group section [    2]
diff --git a/llvm/test/tools/llvm-readobj/elf-groups.test b/llvm/test/tools/llvm-readobj/elf-groups.test
index 9d13900a214..a698eb7337e 100644
--- a/llvm/test/tools/llvm-readobj/elf-groups.test
+++ b/llvm/test/tools/llvm-readobj/elf-groups.test
@@ -15,7 +15,7 @@
 
 RUN: llvm-readobj -g %p/Inputs/elf-groups.x86_64 \
 RUN:   | FileCheck %s
-RUN: llvm-readobj -g --elf-output-style=GNU %p/Inputs/elf-groups.x86_64 \
+RUN: llvm-readelf -g %p/Inputs/elf-groups.x86_64 \
 RUN:   | FileCheck --check-prefix="GNU" %s
 CHECK:         Groups {
 CHECK-NEXT:      Group {
diff --git a/llvm/test/tools/llvm-readobj/elf-hash-histogram.test b/llvm/test/tools/llvm-readobj/elf-hash-histogram.test
index e500c4fa8cd..13aa5137301 100644
--- a/llvm/test/tools/llvm-readobj/elf-hash-histogram.test
+++ b/llvm/test/tools/llvm-readobj/elf-hash-histogram.test
@@ -1,8 +1,8 @@
-RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \
-RUN:  --elf-output-style=GNU | FileCheck %s -check-prefix PPC64GNU
-RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf --elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \
+RUN:   | FileCheck %s -check-prefix PPC64GNU
+RUN: llvm-readelf --elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 \
 RUN:   | FileCheck %s -check-prefix X86GNU
-RUN: llvm-readobj --elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel --elf-output-style=GNU \
+RUN: llvm-readelf --elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel \
 RUN:   | FileCheck %s -check-prefix SYSV
 
 PPC64GNU: Histogram for `.gnu.hash' bucket list length (total of 3 buckets)
diff --git a/llvm/test/tools/llvm-readobj/gnu-file-headers.test b/llvm/test/tools/llvm-readobj/gnu-file-headers.test
index e246a3d717b..c6060ca1beb 100644
--- a/llvm/test/tools/llvm-readobj/gnu-file-headers.test
+++ b/llvm/test/tools/llvm-readobj/gnu-file-headers.test
@@ -1,8 +1,8 @@
-RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-i386 --elf-output-style=GNU \
+RUN: llvm-readelf -h %p/Inputs/trivial.obj.elf-i386 \
 RUN:   | FileCheck %s -check-prefix ELF32
-RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-x86-64 --elf-output-style=GNU \
+RUN: llvm-readelf -h %p/Inputs/trivial.obj.elf-x86-64 \
 RUN:   | FileCheck %s -check-prefix ELF64
-RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-mipsel --elf-output-style=GNU \
+RUN: llvm-readelf -h %p/Inputs/trivial.obj.elf-mipsel \
 RUN:   | FileCheck %s -check-prefix MIPSEL
 
 ELF32:      ELF Header:
diff --git a/llvm/test/tools/llvm-readobj/gnu-phdrs.test b/llvm/test/tools/llvm-readobj/gnu-phdrs.test
index 6db6d546d68..cf6ba17259a 100644
--- a/llvm/test/tools/llvm-readobj/gnu-phdrs.test
+++ b/llvm/test/tools/llvm-readobj/gnu-phdrs.test
@@ -10,9 +10,9 @@
 # compiled as clang++ source.cpp
 # and  clang++ -m32 source.cpp
 
-RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-i386 --elf-output-style=GNU \
+RUN: llvm-readelf -l %p/Inputs/phdrs-elf.exe-i386 \
 RUN:   | FileCheck %s -check-prefix ELF32
-RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf -l %p/Inputs/phdrs-elf.exe-x86_64 \
 RUN:   | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING
 RUN: llvm-readelf -program-headers %p/Inputs/phdrs-elf.exe-x86_64 \
 RUN:   | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING
diff --git a/llvm/test/tools/llvm-readobj/gnu-relocations.test b/llvm/test/tools/llvm-readobj/gnu-relocations.test
index 5b269e06377..1bba0ffad3f 100644
--- a/llvm/test/tools/llvm-readobj/gnu-relocations.test
+++ b/llvm/test/tools/llvm-readobj/gnu-relocations.test
@@ -1,6 +1,6 @@
-RUN: llvm-readobj -r %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \
+RUN: llvm-readelf -r %p/Inputs/relocs.obj.elf-i386 \
 RUN:   | FileCheck %s -check-prefix ELF32
-RUN: llvm-readobj -r %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf -r %p/Inputs/relocs.obj.elf-x86_64 \
 RUN:   | FileCheck %s -check-prefix ELF64
 
 ELF32:    Relocation section '.rel.text' at offset 0x318 contains 41 entries:
diff --git a/llvm/test/tools/llvm-readobj/gnu-sections.test b/llvm/test/tools/llvm-readobj/gnu-sections.test
index a61f767fe14..faf00d9d5ac 100644
--- a/llvm/test/tools/llvm-readobj/gnu-sections.test
+++ b/llvm/test/tools/llvm-readobj/gnu-sections.test
@@ -1,6 +1,6 @@
-RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \
+RUN: llvm-readelf -S %p/Inputs/relocs.obj.elf-i386 \
 RUN:   | FileCheck %s -check-prefix ELF32
-RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf -S %p/Inputs/relocs.obj.elf-x86_64 \
 RUN:   | FileCheck %s -check-prefix ELF64
 RUN: llvm-readobj --wide --sections \
 RUN:   %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
diff --git a/llvm/test/tools/llvm-readobj/gnu-symbols.test b/llvm/test/tools/llvm-readobj/gnu-symbols.test
index 2d864d426c5..3d087ac459b 100644
--- a/llvm/test/tools/llvm-readobj/gnu-symbols.test
+++ b/llvm/test/tools/llvm-readobj/gnu-symbols.test
@@ -1,12 +1,12 @@
-RUN: llvm-readobj --symbols %p/Inputs/symbols-proc-specific.elf-hexagon \
-RUN:  --elf-output-style=GNU | FileCheck %s --check-prefix ELF32
-RUN: llvm-readobj --symbols %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf --symbols %p/Inputs/symbols-proc-specific.elf-hexagon \
+RUN:  | FileCheck %s --check-prefix ELF32
+RUN: llvm-readelf --symbols %p/Inputs/relocs.obj.elf-x86_64 \
 RUN:   | FileCheck %s --check-prefix ELF64
-RUN: llvm-readobj --symbols %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf --symbols %p/Inputs/gnuhash.so.elf-x86_64 \
 RUN:   | FileCheck %s --check-prefixes=SYMTAB,DYN
-RUN: llvm-readobj --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 \
 RUN:   | FileCheck %s --check-prefixes=NO-SYMTAB,DYN
-RUN: llvm-readobj --symbols --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readelf --symbols --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 \
 RUN:   | FileCheck %s --check-prefixes=SYMTAB,DYN
 
 ELF32: Symbol table '.symtab' contains 5 entries:
diff --git a/llvm/test/tools/llvm-readobj/many-sections.s b/llvm/test/tools/llvm-readobj/many-sections.s
index bf3e7b22675..b2050c74eec 100644
--- a/llvm/test/tools/llvm-readobj/many-sections.s
+++ b/llvm/test/tools/llvm-readobj/many-sections.s
@@ -11,14 +11,14 @@
 ## space, but its e_shnum, e_shstrndx, sh_size and sh_link fields are set
 ## according to the above description, so that we can test the dumper.
 
-# RUN: llvm-readobj --file-headers -S --elf-output-style GNU \
-# RUN:   %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=GNU1
+# RUN: llvm-readelf --file-headers -S %p/Inputs/many-sections.elf-x86_64 | \
+# RUN:   FileCheck %s --check-prefix=GNU1
 # GNU1: Number of section headers:         0 (5)
 # GNU1: Section header string table index: 65535 (3)
 # GNU1: There are 5 section headers, starting at offset 0xb8
 
-# RUN: llvm-readobj --file-headers --elf-output-style LLVM \
-# RUN:   %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=LLVM1
+# RUN: llvm-readobj --file-headers %p/Inputs/many-sections.elf-x86_64 | \
+# RUN:   FileCheck %s --check-prefix=LLVM1
 # LLVM1: SectionHeaderCount: 0 (5)
 # LLVM1: StringTableSectionIndex: 65535 (3)
 
@@ -26,12 +26,12 @@
 ## e_shoff field set to zero, but not e_shstrndx, to show that
 ## this corrupt case is handled correctly.
 
-# RUN: llvm-readobj --file-headers --elf-output-style GNU \
-# RUN:   %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=GNU2
+# RUN: llvm-readelf --file-headers %p/Inputs/many-sections-stripped.elf-x86_64 | \
+# RUN:   FileCheck %s --check-prefix=GNU2
 # GNU2: Number of section headers:         0
 # GNU2: Section header string table index: 65535 (corrupt: out of range)
 
-# RUN: llvm-readobj --file-headers --elf-output-style LLVM \
-# RUN:   %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=LLVM2
+# RUN: llvm-readobj --file-headers %p/Inputs/many-sections-stripped.elf-x86_64 | \
+# RUN:   FileCheck %s --check-prefix=LLVM2
 # LLVM2: SectionHeaderCount: 0
 # LLVM2: StringTableSectionIndex: 65535 (corrupt: out of range)
diff --git a/llvm/test/tools/llvm-readobj/mips-got.test b/llvm/test/tools/llvm-readobj/mips-got.test
index c9311421bf5..021dcfb116d 100644
--- a/llvm/test/tools/llvm-readobj/mips-got.test
+++ b/llvm/test/tools/llvm-readobj/mips-got.test
@@ -11,23 +11,17 @@ RUN:   FileCheck %s -check-prefix GOT-EMPTY
 RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips | \
 RUN:   FileCheck %s -check-prefix GOT-STATIC
 
-RUN: not llvm-readobj --mips-plt-got %p/Inputs/relocs.obj.elf-mips \
-RUN:                  --elf-output-style=GNU 2>&1 | \
+RUN: not llvm-readelf --mips-plt-got %p/Inputs/relocs.obj.elf-mips 2>&1 | \
 RUN:   FileCheck %s -check-prefix GNU-GOT-OBJ
-RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-exe.mips \
-RUN:                  --elf-output-style=GNU | \
+RUN: llvm-readelf --mips-plt-got %p/Inputs/dynamic-table-exe.mips | \
 RUN:   FileCheck %s -check-prefix GNU-GOT-EXE
-RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-so.mips \
-RUN:                  --elf-output-style=GNU | \
+RUN: llvm-readelf --mips-plt-got %p/Inputs/dynamic-table-so.mips | \
 RUN:   FileCheck %s -check-prefix GNU-GOT-SO
-RUN: llvm-readobj --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el \
-RUN:                  --elf-output-style=GNU | \
+RUN: llvm-readelf --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el | \
 RUN:   FileCheck %s -check-prefix GNU-GOT-TLS
-RUN: llvm-readobj --mips-plt-got %p/Inputs/got-empty.exe.mipsel \
-RUN:                  --elf-output-style=GNU | \
+RUN: llvm-readelf --mips-plt-got %p/Inputs/got-empty.exe.mipsel | \
 RUN:   FileCheck %s -check-prefix GNU-GOT-EMPTY
-RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips \
-RUN:                  --elf-output-style=GNU | \
+RUN: llvm-readelf --mips-plt-got %p/Inputs/got-static.exe.mips | \
 RUN:   FileCheck %s -check-prefix GNU-GOT-STATIC
 
 GOT-OBJ: error: Cannot find .got section
diff --git a/llvm/test/tools/llvm-readobj/mips-plt.test b/llvm/test/tools/llvm-readobj/mips-plt.test
index 21670b0fb57..686182f873a 100644
--- a/llvm/test/tools/llvm-readobj/mips-plt.test
+++ b/llvm/test/tools/llvm-readobj/mips-plt.test
@@ -1,7 +1,5 @@
 RUN: llvm-readobj --mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel | FileCheck %s
-RUN: llvm-readobj --mips-plt-got --elf-output-style=GNU \
-RUN:              %p/Inputs/got-plt.exe.elf-mipsel \
-RUN:   | FileCheck --check-prefix=GNU %s
+RUN: llvm-readelf --mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel FileCheck --check-prefix=GNU %s
 
 CHECK:      PLT GOT {
 CHECK-NEXT:   Reserved entries [