Skip to content

Commit 97c17e8

Browse files
MaskRayMaskRay
committed
[llvm-readobj] llvm-readobj --elf-output-style=GNU => llvm-readelf. NFC
The latter is much more common. A dedicated --elf-output-style=GNU test demonstrating it is the same as llvm-readelf is sufficient. llvm-svn: 359652
1 parent b159906 commit 97c17e8

14 files changed

+40
-48
lines changed

‎llvm/test/MC/ELF/exclude-debug-dwo.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o %t.o
2-
# RUN: llvm-readobj -S --elf-output-style=GNU %t.o | FileCheck %s
2+
# RUN: llvm-readelf -S %t.o | FileCheck %s
33

44
## Check we add SHF_EXCLUDE flag for .dwo debug sections.
55
# CHECK: .debug_info.dwo {{.*}} E

‎llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# RUN: --globalize-symbol Global1 \
1212
# RUN: --keep-global-symbol Global2 \
1313
# RUN: %t.o %t.2.o
14-
# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.2.o | FileCheck %s
14+
# RUN: llvm-readelf --symbols %t.2.o | FileCheck %s
1515

1616
!ELF
1717
FileHeader:

‎llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
# RUN: -G Weak1 \
4141
# RUN: --globalize-symbol Weak2 \
4242
# RUN: %t.o %t.2.o
43-
# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.2.o | FileCheck %s
43+
# RUN: llvm-readelf --symbols %t.2.o | FileCheck %s
4444

4545
# RUN: llvm-objcopy --regex --keep-global-symbols %t-globals-regexp.txt %t.o %t.3.o
46-
# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.3.o | FileCheck %s --check-prefix=REGEXP
46+
# RUN: llvm-readelf --symbols %t.3.o | FileCheck %s --check-prefix=REGEXP
4747

4848
!ELF
4949
FileHeader:

‎llvm/test/tools/llvm-readobj/broken-group.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: yaml2obj %s -o %t.o
22

3-
# RUN: llvm-readobj --elf-section-groups --elf-output-style=GNU \
3+
# RUN: llvm-readelf --elf-section-groups \
44
# RUN: %t.o >%tout.log 2>%terr.log
55
# RUN: FileCheck %s -check-prefix=GNU-STDERR < %terr.log
66
# GNU-STDERR: Error: section [ 3] in group section [ 4] already in group section [ 2]

‎llvm/test/tools/llvm-readobj/elf-groups.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
RUN: llvm-readobj -g %p/Inputs/elf-groups.x86_64 \
1717
RUN: | FileCheck %s
18-
RUN: llvm-readobj -g --elf-output-style=GNU %p/Inputs/elf-groups.x86_64 \
18+
RUN: llvm-readelf -g %p/Inputs/elf-groups.x86_64 \
1919
RUN: | FileCheck --check-prefix="GNU" %s
2020
CHECK: Groups {
2121
CHECK-NEXT: Group {

‎llvm/test/tools/llvm-readobj/elf-hash-histogram.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \
2-
RUN: --elf-output-style=GNU | FileCheck %s -check-prefix PPC64GNU
3-
RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
1+
RUN: llvm-readelf --elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \
2+
RUN: | FileCheck %s -check-prefix PPC64GNU
3+
RUN: llvm-readelf --elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 \
44
RUN: | FileCheck %s -check-prefix X86GNU
5-
RUN: llvm-readobj --elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel --elf-output-style=GNU \
5+
RUN: llvm-readelf --elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel \
66
RUN: | FileCheck %s -check-prefix SYSV
77

88
PPC64GNU: Histogram for `.gnu.hash' bucket list length (total of 3 buckets)

‎llvm/test/tools/llvm-readobj/gnu-file-headers.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-i386 --elf-output-style=GNU \
1+
RUN: llvm-readelf -h %p/Inputs/trivial.obj.elf-i386 \
22
RUN: | FileCheck %s -check-prefix ELF32
3-
RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-x86-64 --elf-output-style=GNU \
3+
RUN: llvm-readelf -h %p/Inputs/trivial.obj.elf-x86-64 \
44
RUN: | FileCheck %s -check-prefix ELF64
5-
RUN: llvm-readobj -h %p/Inputs/trivial.obj.elf-mipsel --elf-output-style=GNU \
5+
RUN: llvm-readelf -h %p/Inputs/trivial.obj.elf-mipsel \
66
RUN: | FileCheck %s -check-prefix MIPSEL
77

88
ELF32: ELF Header:

‎llvm/test/tools/llvm-readobj/gnu-phdrs.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# compiled as clang++ source.cpp
1111
# and clang++ -m32 source.cpp
1212

13-
RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-i386 --elf-output-style=GNU \
13+
RUN: llvm-readelf -l %p/Inputs/phdrs-elf.exe-i386 \
1414
RUN: | FileCheck %s -check-prefix ELF32
15-
RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-x86_64 --elf-output-style=GNU \
15+
RUN: llvm-readelf -l %p/Inputs/phdrs-elf.exe-x86_64 \
1616
RUN: | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING
1717
RUN: llvm-readelf -program-headers %p/Inputs/phdrs-elf.exe-x86_64 \
1818
RUN: | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING

‎llvm/test/tools/llvm-readobj/gnu-relocations.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
RUN: llvm-readobj -r %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \
1+
RUN: llvm-readelf -r %p/Inputs/relocs.obj.elf-i386 \
22
RUN: | FileCheck %s -check-prefix ELF32
3-
RUN: llvm-readobj -r %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
3+
RUN: llvm-readelf -r %p/Inputs/relocs.obj.elf-x86_64 \
44
RUN: | FileCheck %s -check-prefix ELF64
55

66
ELF32: Relocation section '.rel.text' at offset 0x318 contains 41 entries:

‎llvm/test/tools/llvm-readobj/gnu-sections.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \
1+
RUN: llvm-readelf -S %p/Inputs/relocs.obj.elf-i386 \
22
RUN: | FileCheck %s -check-prefix ELF32
3-
RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
3+
RUN: llvm-readelf -S %p/Inputs/relocs.obj.elf-x86_64 \
44
RUN: | FileCheck %s -check-prefix ELF64
55
RUN: llvm-readobj --wide --sections \
66
RUN: %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \

‎llvm/test/tools/llvm-readobj/gnu-symbols.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
RUN: llvm-readobj --symbols %p/Inputs/symbols-proc-specific.elf-hexagon \
2-
RUN: --elf-output-style=GNU | FileCheck %s --check-prefix ELF32
3-
RUN: llvm-readobj --symbols %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
1+
RUN: llvm-readelf --symbols %p/Inputs/symbols-proc-specific.elf-hexagon \
2+
RUN: | FileCheck %s --check-prefix ELF32
3+
RUN: llvm-readelf --symbols %p/Inputs/relocs.obj.elf-x86_64 \
44
RUN: | FileCheck %s --check-prefix ELF64
5-
RUN: llvm-readobj --symbols %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
5+
RUN: llvm-readelf --symbols %p/Inputs/gnuhash.so.elf-x86_64 \
66
RUN: | FileCheck %s --check-prefixes=SYMTAB,DYN
7-
RUN: llvm-readobj --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
7+
RUN: llvm-readelf --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 \
88
RUN: | FileCheck %s --check-prefixes=NO-SYMTAB,DYN
9-
RUN: llvm-readobj --symbols --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
9+
RUN: llvm-readelf --symbols --dyn-symbols %p/Inputs/gnuhash.so.elf-x86_64 \
1010
RUN: | FileCheck %s --check-prefixes=SYMTAB,DYN
1111

1212
ELF32: Symbol table '.symtab' contains 5 entries:

‎llvm/test/tools/llvm-readobj/many-sections.s

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@
1111
## space, but its e_shnum, e_shstrndx, sh_size and sh_link fields are set
1212
## according to the above description, so that we can test the dumper.
1313

14-
# RUN: llvm-readobj --file-headers -S --elf-output-style GNU \
15-
# RUN: %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=GNU1
14+
# RUN: llvm-readelf --file-headers -S %p/Inputs/many-sections.elf-x86_64 | \
15+
# RUN: FileCheck %s --check-prefix=GNU1
1616
# GNU1: Number of section headers: 0 (5)
1717
# GNU1: Section header string table index: 65535 (3)
1818
# GNU1: There are 5 section headers, starting at offset 0xb8
1919

20-
# RUN: llvm-readobj --file-headers --elf-output-style LLVM \
21-
# RUN: %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=LLVM1
20+
# RUN: llvm-readobj --file-headers %p/Inputs/many-sections.elf-x86_64 | \
21+
# RUN: FileCheck %s --check-prefix=LLVM1
2222
# LLVM1: SectionHeaderCount: 0 (5)
2323
# LLVM1: StringTableSectionIndex: 65535 (3)
2424

2525
## many-sections-stripped.elf-x86_64 is many-sections.elf-x86_64 with
2626
## e_shoff field set to zero, but not e_shstrndx, to show that
2727
## this corrupt case is handled correctly.
2828

29-
# RUN: llvm-readobj --file-headers --elf-output-style GNU \
30-
# RUN: %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=GNU2
29+
# RUN: llvm-readelf --file-headers %p/Inputs/many-sections-stripped.elf-x86_64 | \
30+
# RUN: FileCheck %s --check-prefix=GNU2
3131
# GNU2: Number of section headers: 0
3232
# GNU2: Section header string table index: 65535 (corrupt: out of range)
3333

34-
# RUN: llvm-readobj --file-headers --elf-output-style LLVM \
35-
# RUN: %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=LLVM2
34+
# RUN: llvm-readobj --file-headers %p/Inputs/many-sections-stripped.elf-x86_64 | \
35+
# RUN: FileCheck %s --check-prefix=LLVM2
3636
# LLVM2: SectionHeaderCount: 0
3737
# LLVM2: StringTableSectionIndex: 65535 (corrupt: out of range)

‎llvm/test/tools/llvm-readobj/mips-got.test

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,17 @@ RUN: FileCheck %s -check-prefix GOT-EMPTY
1111
RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips | \
1212
RUN: FileCheck %s -check-prefix GOT-STATIC
1313

14-
RUN: not llvm-readobj --mips-plt-got %p/Inputs/relocs.obj.elf-mips \
15-
RUN: --elf-output-style=GNU 2>&1 | \
14+
RUN: not llvm-readelf --mips-plt-got %p/Inputs/relocs.obj.elf-mips 2>&1 | \
1615
RUN: FileCheck %s -check-prefix GNU-GOT-OBJ
17-
RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-exe.mips \
18-
RUN: --elf-output-style=GNU | \
16+
RUN: llvm-readelf --mips-plt-got %p/Inputs/dynamic-table-exe.mips | \
1917
RUN: FileCheck %s -check-prefix GNU-GOT-EXE
20-
RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-so.mips \
21-
RUN: --elf-output-style=GNU | \
18+
RUN: llvm-readelf --mips-plt-got %p/Inputs/dynamic-table-so.mips | \
2219
RUN: FileCheck %s -check-prefix GNU-GOT-SO
23-
RUN: llvm-readobj --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el \
24-
RUN: --elf-output-style=GNU | \
20+
RUN: llvm-readelf --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el | \
2521
RUN: FileCheck %s -check-prefix GNU-GOT-TLS
26-
RUN: llvm-readobj --mips-plt-got %p/Inputs/got-empty.exe.mipsel \
27-
RUN: --elf-output-style=GNU | \
22+
RUN: llvm-readelf --mips-plt-got %p/Inputs/got-empty.exe.mipsel | \
2823
RUN: FileCheck %s -check-prefix GNU-GOT-EMPTY
29-
RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips \
30-
RUN: --elf-output-style=GNU | \
24+
RUN: llvm-readelf --mips-plt-got %p/Inputs/got-static.exe.mips | \
3125
RUN: FileCheck %s -check-prefix GNU-GOT-STATIC
3226

3327
GOT-OBJ: error: Cannot find .got section

‎llvm/test/tools/llvm-readobj/mips-plt.test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
RUN: llvm-readobj --mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel | FileCheck %s
2-
RUN: llvm-readobj --mips-plt-got --elf-output-style=GNU \
3-
RUN: %p/Inputs/got-plt.exe.elf-mipsel \
4-
RUN: | FileCheck --check-prefix=GNU %s
2+
RUN: llvm-readelf --mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel FileCheck --check-prefix=GNU %s
53

64
CHECK: PLT GOT {
75
CHECK-NEXT: Reserved entries [

0 commit comments

Comments
 (0)