Skip to content

Commit b159906

Browse files
committed
[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 llvm-svn: 359651
1 parent ad3faad commit b159906

File tree

597 files changed

+1016
-1016
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

597 files changed

+1016
-1016
lines changed

lld/test/COFF/arm64-delayimport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: yaml2obj < %s > %t.obj
44
# RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj %p/Inputs/library-arm64.lib /alternatename:__delayLoadHelper2=main /delayload:library.dll
55
# RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix DISASM
6-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
6+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
77

88
# DISASM: 140001014: 11 00 00 d0 adrp x17, #8192
99
# DISASM: 140001018: 31 22 00 91 add x17, x17, #8

lld/test/COFF/arm64-import2.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
55
# RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t.obj %p/Inputs/library-arm64.lib %p/Inputs/library2-arm64.lib
66
# RUN: llvm-objdump -d %t.exe | FileCheck %s -check-prefix AFTER
7-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
7+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s -check-prefix IMPORTS
88

99
# BEFORE: Disassembly of section .text:
1010
# BEFORE: 0: 00 00 00 94 bl #0

lld/test/COFF/arm64-magic.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: yaml2obj < %s > %t.obj
22
# RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
3-
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
3+
# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
44

55
# CHECK: Format: COFF-ARM64
66
# CHECK: Arch: aarch64

lld/test/COFF/armnt-entry-point.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: yaml2obj < %p/Inputs/armnt-executable.obj.yaml > %t.obj
22
# RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
3-
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
3+
# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
44

55
CHECK: AddressOfEntryPoint: 0x1001

lld/test/COFF/armnt-imports.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: yaml2obj < %s > %t.obj
22
# RUN: lld-link /out:%t.exe /subsystem:console %t.obj \
33
# RUN: /entry:mainCRTStartup %p/Inputs/library.lib
4-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck %s
4+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck %s
55

66
# CHECK: Import {
77
# CHECK: Name: library.dll

lld/test/COFF/associative-comdat-mingw.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# RUN: llvm-mc -triple=x86_64-windows-gnu %S/Inputs/associative-comdat-mingw-2.s -filetype=obj -o %t2.obj
55

66
# RUN: lld-link -lldmingw -entry:main %t1.obj %t2.obj -out:%t.gc.exe -verbose
7-
# RUN: llvm-readobj -sections %t.gc.exe | FileCheck %s
7+
# RUN: llvm-readobj --sections %t.gc.exe | FileCheck %s
88

99
# CHECK: Sections [
1010
# CHECK: Section {

lld/test/COFF/associative-comdat.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# RUN: llvm-mc -triple=x86_64-windows-msvc %S/Inputs/associative-comdat-2.s -filetype=obj -o %t2.obj
44

55
# RUN: lld-link -entry:main %t1.obj %t2.obj -out:%t.gc.exe
6-
# RUN: llvm-readobj -sections %t.gc.exe | FileCheck %s
6+
# RUN: llvm-readobj --sections %t.gc.exe | FileCheck %s
77

88
# RUN: lld-link -entry:main %t1.obj %t2.obj -opt:noref -out:%t.nogc.exe
9-
# RUN: llvm-readobj -sections %t.nogc.exe | FileCheck %s
9+
# RUN: llvm-readobj --sections %t.nogc.exe | FileCheck %s
1010

1111
# CHECK: Sections [
1212
# CHECK: Section {

lld/test/COFF/autoimport-arm-data.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# RUN: llvm-mc -triple=armv7-windows-gnu %s -filetype=obj -o %t.obj
88
# RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
99

10-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
10+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
1111
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
1212

1313
# IMPORTS: Import {

lld/test/COFF/autoimport-arm64-data.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# RUN: llvm-mc -triple=aarch64-windows-gnu %s -filetype=obj -o %t.obj
88
# RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
99

10-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
10+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
1111
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
1212

1313
# IMPORTS: Import {

lld/test/COFF/autoimport-gnu-implib.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
1010
# RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-implib.a -verbose
1111

12-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
12+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
1313

1414
# IMPORTS: Import {
1515
# IMPORTS-NEXT: Name: foo.dll

lld/test/COFF/autoimport-refptr.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
88
# RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
99

10-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
10+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
1111
# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
1212
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
1313

lld/test/COFF/autoimport-x86.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
88
# RUN: lld-link -lldmingw -out:%t.exe -entry:main %t.obj %t-lib.lib -verbose
99

10-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
10+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORTS %s
1111
# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
1212
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=CONTENTS %s
1313

lld/test/COFF/base.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# RUN: yaml2obj < %s > %t.obj
22

33
# RUN: lld-link /out:%t.exe /entry:main %t.obj
4-
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT-HEADER %s
4+
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=DEFAULT-HEADER %s
55
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=DEFAULT-TEXT %s
66

77
# DEFAULT-HEADER: ImageBase: 0x140000000
88
# DEFAULT-TEXT: Contents of section .text:
99
# DEFAULT-TEXT-NEXT: 1000 00000040 01000000
1010

1111
# RUN: lld-link /out:%t.exe /entry:main %t.obj /base:0x280000000
12-
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BASE-HEADER %s
12+
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=BASE-HEADER %s
1313
# RUN: llvm-objdump -s %t.exe | FileCheck -check-prefix=BASE-TEXT %s
1414

1515
# BASE-HEADER: ImageBase: 0x280000000

lld/test/COFF/baserel.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# RUN: yaml2obj < %s > %t.obj
22
#
33
# RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
4-
# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix=BASEREL
4+
# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix=BASEREL
55
#
66
# RUN: lld-link /out:%t.exe /entry:main /fixed %t.obj %p/Inputs/std64.lib
7-
# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix=NOBASEREL
7+
# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix=NOBASEREL
88
#
99
# BASEREL: BaseReloc [
1010
# BASEREL-NEXT: Entry {
@@ -44,11 +44,11 @@
4444
# NOBASEREL-NEXT: ]
4545
#
4646
# RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/std64.lib
47-
# RUN: llvm-readobj -file-headers -sections %t.exe | FileCheck %s \
47+
# RUN: llvm-readobj --file-headers --sections %t.exe | FileCheck %s \
4848
# RUN: --check-prefix=BASEREL-HEADER
4949
#
5050
# RUN: lld-link /out:%t.exe /entry:main /fixed %t.obj %p/Inputs/std64.lib
51-
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s \
51+
# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s \
5252
# RUN: --check-prefix=NOBASEREL-HEADER
5353
#
5454
# BASEREL-HEADER-NOT: IMAGE_FILE_RELOCS_STRIPPED

lld/test/COFF/combined-resources.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# RUN: lld-link /out:%t.exe /entry:main %t.obj %p/Inputs/resource.res \
99
# RUN: %p/Inputs/combined-resources.res %p/Inputs/combined-resources-2.res
1010

11-
# RUN: llvm-readobj -coff-resources -file-headers -section-data %t.exe | \
11+
# RUN: llvm-readobj --coff-resources --file-headers --section-data %t.exe | \
1212
# RUN: FileCheck %s
1313

1414
CHECK: ResourceTableRVA: 0x2000

lld/test/COFF/common-replacement.s

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

66
# RUN: lld-link -lldmingw -entry:main %t1.obj %t2.obj -out:%t.exe -verbose 2>&1 \
77
# RUN: | FileCheck -check-prefix VERBOSE %s
8-
# RUN: llvm-readobj -s %t.exe | FileCheck -check-prefix SECTIONS %s
8+
# RUN: llvm-readobj -S %t.exe | FileCheck -check-prefix SECTIONS %s
99

1010
# VERBOSE: -aligncomm:"foo",2
1111

lld/test/COFF/constant-export.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: mkdir -p %t
22
# RUN: yaml2obj -o %t/constant-export.obj %s
33
# RUN: lld-link /machine:x86 /dll /entry:__CFConstantStringClassReference -out:%t/constant-export.dll %t/constant-export.obj
4-
# RUN: llvm-readobj -coff-exports %t/constant-export.lib | FileCheck %s
4+
# RUN: llvm-readobj --coff-exports %t/constant-export.lib | FileCheck %s
55

66
# CHECK: Type: const
77
# CHECK: Name type: noprefix

lld/test/COFF/crt-chars.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RUN: yaml2obj %s > %t.obj
22
# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj
3-
# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s
3+
# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s
44

55
# CHECK: Name: .CRT
66
# CHECK: Characteristics [

lld/test/COFF/crt-dyn-initializer-order.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@
3333
# CHECK-NEXT: SectionData (
3434

3535
# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t1.obj %t2.obj
36-
# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE1
36+
# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE1
3737
# CASE1-NEXT: 01020304 55701011 1205
3838

3939
# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t.obj %t2.obj %t1.obj
40-
# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE2
40+
# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE2
4141
# CASE2-NEXT: 01020304 10111255 7005
4242

4343
# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t2.obj %t.obj
44-
# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE3
44+
# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE3
4545
# CASE3-NEXT: 01557010 11120203 0405
4646

4747
# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t1.obj %t.obj %t2.obj
48-
# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE4
48+
# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE4
4949
# CASE4-NEXT: 01557002 03041011 1205
5050

5151
# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t1.obj %t.obj
52-
# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE5
52+
# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE5
5353
# CASE5-NEXT: 01101112 55700203 0405
5454

5555
# RUN: lld-link /out:%t.dll /entry:__ImageBase /dll %t2.obj %t.obj %t1.obj
56-
# RUN: llvm-readobj -sections -section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE6
56+
# RUN: llvm-readobj --sections --section-data %t.dll | FileCheck %s --check-prefixes CHECK,CASE6
5757
# CASE6-NEXT: 01101112 02030455 7005
5858

5959
# CHECK-NEXT: )

lld/test/COFF/debug-reloc.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# RUN: llvm-mc -triple=x86_64-windows-gnu %s -filetype=obj -o %t.obj
44

55
# RUN: lld-link -lldmingw -debug:dwarf -out:%t.exe -entry:mainfunc -subsystem:console %t.obj
6-
# RUN: llvm-readobj -sections %t.exe | FileCheck %s -check-prefix SECTIONS
7-
# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck %s -check-prefix RELOCS
8-
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix HEADERS
9-
# RUN: llvm-readobj -coff-debug-directory %t.exe | FileCheck %s -check-prefix DEBUG
6+
# RUN: llvm-readobj --sections %t.exe | FileCheck %s -check-prefix SECTIONS
7+
# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck %s -check-prefix RELOCS
8+
# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s -check-prefix HEADERS
9+
# RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck %s -check-prefix DEBUG
1010

1111
# SECTIONS: Number: 3
1212
# SECTIONS-NEXT: Name: .buildid (2E 62 75 69 6C 64 69 64)

lld/test/COFF/def-export-stdcall.s

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: echo -e "LIBRARY foo\nEXPORTS\n stdcall\n fastcall\n vectorcall\n _underscored" > %t.def
44
# RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
55
# RUN: llvm-readobj %t.lib | FileCheck -check-prefix UNDECORATED-IMPLIB %s
6-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix UNDECORATED-EXPORTS %s
6+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix UNDECORATED-EXPORTS %s
77

88
# UNDECORATED-IMPLIB: Name type: noprefix
99
# UNDECORATED-IMPLIB-NEXT: __imp___underscored
@@ -27,7 +27,7 @@
2727
# RUN: echo -e "LIBRARY foo\nEXPORTS\n _stdcall@8\n @fastcall@8\n vectorcall@@8" > %t.def
2828
# RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
2929
# RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-IMPLIB %s
30-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
30+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
3131

3232
# DECORATED-IMPLIB: Name type: name
3333
# DECORATED-IMPLIB-NEXT: __imp_@fastcall@8
@@ -48,7 +48,7 @@
4848
# RUN: echo -e "LIBRARY foo\nEXPORTS\n stdcall@8\n @fastcall@8\n vectorcall@@8" > %t.def
4949
# RUN: lld-link -lldmingw -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
5050
# RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-MINGW-IMPLIB %s
51-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-MINGW-EXPORTS %s
51+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-MINGW-EXPORTS %s
5252

5353
# DECORATED-MINGW-IMPLIB: Name type: name
5454
# DECORATED-MINGW-IMPLIB-NEXT: __imp_@fastcall@8
@@ -68,11 +68,11 @@
6868

6969
# RUN: lld-link -lldmingw -kill-at -entry:dllmain -dll -def:%t.def %t.obj -out:%t.dll -implib:%t.lib
7070
# RUN: llvm-readobj %t.lib | FileCheck -check-prefix MINGW-KILL-AT-IMPLIB %s
71-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
71+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
7272

7373
# RUN: lld-link -lldmingw -kill-at -entry:dllmain -dll %t.obj -out:%t.dll -implib:%t.lib
7474
# RUN: llvm-readobj %t.lib | FileCheck -check-prefix MINGW-KILL-AT-IMPLIB %s
75-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
75+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix MINGW-KILL-AT-EXPORTS %s
7676

7777
# MINGW-KILL-AT-IMPLIB: Name type: noprefix
7878
# MINGW-KILL-AT-IMPLIB: __imp__fastcall

lld/test/COFF/delayimports-armnt.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# RUN: lld-link %t.obj %p/Inputs/library.lib /subsystem:console \
44
# RUN: /entry:mainCRTStartup /alternatename:__delayLoadHelper2=mainCRTStartup \
55
# RUN: /delayload:library.dll /out:%t.exe
6-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
7-
# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
6+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
7+
# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
88
# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
99

1010
# IMPORT: Format: COFF-ARM

lld/test/COFF/delayimports.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# RUN: lld-link /out:%t.exe /entry:main /subsystem:console \
22
# RUN: %p/Inputs/hello64.obj %p/Inputs/std64.lib /delayload:STD64.DLL \
33
# RUN: /alternatename:__delayLoadHelper2=main
4-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
5-
# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
4+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
5+
# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
66

77
IMPORT: DelayImport {
88
IMPORT-NEXT: Name: std64.dll

lld/test/COFF/delayimports32.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# RUN: lld-link %t.obj %p/Inputs/std32.lib /subsystem:console \
44
# RUN: /entry:main@0 /alternatename:___delayLoadHelper2@8=_main@0 \
55
# RUN: /delayload:std32.dll /out:%t.exe
6-
# RUN: llvm-readobj -coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
7-
# RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
6+
# RUN: llvm-readobj --coff-imports %t.exe | FileCheck -check-prefix=IMPORT %s
7+
# RUN: llvm-readobj --coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
88
# RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=DISASM %s
99

1010
IMPORT: Format: COFF-i386

lld/test/COFF/dll.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ EXPORT-LTO-NEXT: 3 0x1030 exportfn3
4242
# RUN: /export:exportfn1 /export:exportfn2
4343
# RUN: yaml2obj < %p/Inputs/import.yaml > %t2.obj
4444
# RUN: lld-link /out:%t2.exe /entry:main %t2.obj %t2.lib
45-
# RUN: llvm-readobj -coff-imports %t2.exe | FileCheck -check-prefix=IMPORT %s
45+
# RUN: llvm-readobj --coff-imports %t2.exe | FileCheck -check-prefix=IMPORT %s
4646

4747
# RUN: lld-link /out:%t2.lto.exe /entry:main %t2.obj %t.lto.lib
48-
# RUN: llvm-readobj -coff-imports %t2.lto.exe | FileCheck -check-prefix=IMPORT %s
48+
# RUN: llvm-readobj --coff-imports %t2.lto.exe | FileCheck -check-prefix=IMPORT %s
4949

5050
IMPORT: Symbol: exportfn1
5151
IMPORT: Symbol: exportfn2

lld/test/COFF/dllexport.s

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

44
# RUN: lld-link -entry:dllmain -dll %t.obj -out:%t.dll -implib:%t.lib
55
# RUN: llvm-readobj %t.lib | FileCheck -check-prefix DECORATED-IMPLIB %s
6-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
6+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix DECORATED-EXPORTS %s
77

88
# DECORATED-IMPLIB: Name type: name
99
# DECORATED-IMPLIB-NEXT: __imp_@fastcall@8

lld/test/COFF/dllimport-gc.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# RUN: yaml2obj < %s > %t.obj
77

88
# RUN: lld-link /out:%t1.exe /entry:main %t.obj %t-oldname.obj %t.lib
9-
# RUN: llvm-readobj -coff-imports %t1.exe | FileCheck -check-prefix=REF %s
9+
# RUN: llvm-readobj --coff-imports %t1.exe | FileCheck -check-prefix=REF %s
1010
# REF-NOT: Symbol: exportfn1
1111

1212
# RUN: lld-link /out:%t2.exe /entry:main %t.obj %t-oldname.obj %t.lib /opt:noref
13-
# RUN: llvm-readobj -coff-imports %t2.exe | FileCheck -check-prefix=NOREF %s
13+
# RUN: llvm-readobj --coff-imports %t2.exe | FileCheck -check-prefix=NOREF %s
1414
# NOREF: Symbol: exportfn1
1515

1616
--- !COFF

lld/test/COFF/entry-inference-mingw.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# RUN: lld-link -lldmingw %t.o -out:%t-cui.exe -subsystem:console 2>&1 | FileCheck -allow-empty -check-prefix=LINK %s
66
# RUN: lld-link -lldmingw %t.o -out:%t-gui.exe -subsystem:windows 2>&1 | FileCheck -allow-empty -check-prefix=LINK %s
77

8-
# RUN: llvm-readobj -file-headers %t-default.exe | FileCheck -check-prefix=CUI %s
9-
# RUN: llvm-readobj -file-headers %t-cui.exe | FileCheck -check-prefix=CUI %s
10-
# RUN: llvm-readobj -file-headers %t-gui.exe | FileCheck -check-prefix=GUI %s
8+
# RUN: llvm-readobj --file-headers %t-default.exe | FileCheck -check-prefix=CUI %s
9+
# RUN: llvm-readobj --file-headers %t-cui.exe | FileCheck -check-prefix=CUI %s
10+
# RUN: llvm-readobj --file-headers %t-gui.exe | FileCheck -check-prefix=GUI %s
1111

1212
# Check that this doesn't print any warnings.
1313
# LINK-NOT: found both wmain and main

lld/test/COFF/exclude-all.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
44

55
# RUN: lld-link -lldmingw -exclude-all-symbols -dll -out:%t.dll -entry:DllMainCRTStartup@12 %t.obj
6-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck %s -check-prefix=NO-EXPORTS
6+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck %s -check-prefix=NO-EXPORTS
77

88
# NO-EXPORTS-NOT: Name:
99

@@ -26,6 +26,6 @@ _dataSym:
2626
# RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
2727
#
2828
# RUN: lld-link -out:%t.dll -dll %t.obj -lldmingw -exclude-all-symbols -output-def:%t.def
29-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix=DLLEXPORT %s
29+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=DLLEXPORT %s
3030

3131
# DLLEXPORT: Name: exportfn3

lld/test/COFF/export-all.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
44

55
# RUN: lld-link -lldmingw -dll -out:%t.dll -entry:DllMainCRTStartup@12 %t.obj -implib:%t.lib
6-
# RUN: llvm-readobj -coff-exports %t.dll | grep Name: | FileCheck %s
6+
# RUN: llvm-readobj --coff-exports %t.dll | grep Name: | FileCheck %s
77
# RUN: llvm-readobj %t.lib | FileCheck -check-prefix=IMPLIB %s
88

99
# CHECK: Name:
@@ -43,7 +43,7 @@ __imp__unexported:
4343
# RUN: yaml2obj < %p/Inputs/export.yaml > %t.obj
4444
#
4545
# RUN: lld-link -out:%t.dll -dll %t.obj -lldmingw -export-all-symbols -output-def:%t.def
46-
# RUN: llvm-readobj -coff-exports %t.dll | FileCheck -check-prefix=CHECK2 %s
46+
# RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=CHECK2 %s
4747
# RUN: cat %t.def | FileCheck -check-prefix=CHECK2-DEF %s
4848

4949
# Note, this will actually export _DllMainCRTStartup as well, since

0 commit comments

Comments
 (0)