summaryrefslogtreecommitdiffstats
path: root/llvm/test/MC/COFF
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/test/MC/COFF')
-rw-r--r--llvm/test/MC/COFF/addrsig.s2
-rw-r--r--llvm/test/MC/COFF/align-nops.s2
-rw-r--r--llvm/test/MC/COFF/basic-coff-64.s2
-rw-r--r--llvm/test/MC/COFF/basic-coff.s2
-rw-r--r--llvm/test/MC/COFF/bss.s4
-rw-r--r--llvm/test/MC/COFF/comm-align.s2
-rw-r--r--llvm/test/MC/COFF/cross-section-relative.s2
-rw-r--r--llvm/test/MC/COFF/cv-def-range-gap.s2
-rw-r--r--llvm/test/MC/COFF/cv-def-range.s2
-rw-r--r--llvm/test/MC/COFF/cv-empty-file-table.s2
-rw-r--r--llvm/test/MC/COFF/cv-empty-linetable.s2
-rw-r--r--llvm/test/MC/COFF/cv-fpo-csrs.s2
-rw-r--r--llvm/test/MC/COFF/cv-fpo-realign.s2
-rw-r--r--llvm/test/MC/COFF/cv-fpo-setframe.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable-infloop.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable-unlikely.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable-unreachable.s2
-rw-r--r--llvm/test/MC/COFF/cv-inline-linetable.s2
-rw-r--r--llvm/test/MC/COFF/cv-loc-unreachable-2.s2
-rw-r--r--llvm/test/MC/COFF/cv-loc-unreachable.s2
-rw-r--r--llvm/test/MC/COFF/cv-loc.s2
-rw-r--r--llvm/test/MC/COFF/cv-string.s2
-rw-r--r--llvm/test/MC/COFF/diff.s2
-rw-r--r--llvm/test/MC/COFF/directive-section-characteristics.ll2
-rw-r--r--llvm/test/MC/COFF/early-dce.s2
-rw-r--r--llvm/test/MC/COFF/eh-frame.s2
-rw-r--r--llvm/test/MC/COFF/file.s2
-rw-r--r--llvm/test/MC/COFF/linkonce.s4
-rw-r--r--llvm/test/MC/COFF/module-asm.ll4
-rw-r--r--llvm/test/MC/COFF/pr28462.s2
-rw-r--r--llvm/test/MC/COFF/secidx.s2
-rw-r--r--llvm/test/MC/COFF/secrel32-undef.s2
-rw-r--r--llvm/test/MC/COFF/secrel32.s2
-rw-r--r--llvm/test/MC/COFF/section-comdat.s4
-rw-r--r--llvm/test/MC/COFF/section-name-encoding.s2
-rw-r--r--llvm/test/MC/COFF/section.s4
-rw-r--r--llvm/test/MC/COFF/seh-align1.s2
-rw-r--r--llvm/test/MC/COFF/seh-align2.s2
-rw-r--r--llvm/test/MC/COFF/seh-align3.s2
-rw-r--r--llvm/test/MC/COFF/seh-linkonce.s2
-rw-r--r--llvm/test/MC/COFF/seh-section-2.s2
-rw-r--r--llvm/test/MC/COFF/seh-section.s2
-rw-r--r--llvm/test/MC/COFF/seh.s2
-rw-r--r--llvm/test/MC/COFF/simple-fixups.s4
-rw-r--r--llvm/test/MC/COFF/symbol-fragment-offset-64.s2
-rw-r--r--llvm/test/MC/COFF/symbol-fragment-offset.s2
46 files changed, 52 insertions, 52 deletions
diff --git a/llvm/test/MC/COFF/addrsig.s b/llvm/test/MC/COFF/addrsig.s
index 815102ed88f..938c18f61bf 100644
--- a/llvm/test/MC/COFF/addrsig.s
+++ b/llvm/test/MC/COFF/addrsig.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -s -t -sd -addrsig | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -S -t --sd --addrsig | FileCheck %s
// CHECK: Name: .llvm_addrsig
// CHECK-NEXT: VirtualSize: 0x0
diff --git a/llvm/test/MC/COFF/align-nops.s b/llvm/test/MC/COFF/align-nops.s
index 6d23721ed77..e9610397492 100644
--- a/llvm/test/MC/COFF/align-nops.s
+++ b/llvm/test/MC/COFF/align-nops.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 -mcpu=pentiumpro %s | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 -mcpu=pentiumpro %s | llvm-readobj -S --sd | FileCheck %s
// Test that we get optimal nops in text
.text
diff --git a/llvm/test/MC/COFF/basic-coff-64.s b/llvm/test/MC/COFF/basic-coff-64.s
index 5fe710fdba4..2457e139295 100644
--- a/llvm/test/MC/COFF/basic-coff-64.s
+++ b/llvm/test/MC/COFF/basic-coff-64.s
@@ -1,7 +1,7 @@
// This test checks that the COFF object emitter works for the most basic
// programs.
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/basic-coff.s b/llvm/test/MC/COFF/basic-coff.s
index 575a937c957..7ad61308d94 100644
--- a/llvm/test/MC/COFF/basic-coff.s
+++ b/llvm/test/MC/COFF/basic-coff.s
@@ -1,7 +1,7 @@
// This test checks that the COFF object emitter works for the most basic
// programs.
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/bss.s b/llvm/test/MC/COFF/bss.s
index 17ae0daa1c3..d707703a4c4 100644
--- a/llvm/test/MC/COFF/bss.s
+++ b/llvm/test/MC/COFF/bss.s
@@ -1,7 +1,7 @@
// The purpose of this test is to verify that bss sections are emitted correctly.
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -S | FileCheck %s
.bss
.globl _g0
diff --git a/llvm/test/MC/COFF/comm-align.s b/llvm/test/MC/COFF/comm-align.s
index ca6bfbea247..048d92e614f 100644
--- a/llvm/test/MC/COFF/comm-align.s
+++ b/llvm/test/MC/COFF/comm-align.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple i686-windows-gnu -filetype obj -o - %s \
-# RUN: | llvm-readobj -coff-directives -symbols | FileCheck %s
+# RUN: | llvm-readobj --coff-directives --symbols | FileCheck %s
# NOTE: this test checks multiple things:
# - that -aligncomm is not emitted for 1-byte alignment
diff --git a/llvm/test/MC/COFF/cross-section-relative.s b/llvm/test/MC/COFF/cross-section-relative.s
index a9b7e6dbd5d..c448575891d 100644
--- a/llvm/test/MC/COFF/cross-section-relative.s
+++ b/llvm/test/MC/COFF/cross-section-relative.s
@@ -1,5 +1,5 @@
// Verify the .fix data section conveys the right offsets and the right relocations
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -relocations -expand-relocs -sections -section-data | FileCheck %s --check-prefix=READOBJ
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o - | llvm-readobj -r --expand-relocs -S --section-data | FileCheck %s --check-prefix=READOBJ
.text
.section .rdata,"dr"
diff --git a/llvm/test/MC/COFF/cv-def-range-gap.s b/llvm/test/MC/COFF/cv-def-range-gap.s
index 2a1a179b430..877eaeef7e4 100644
--- a/llvm/test/MC/COFF/cv-def-range-gap.s
+++ b/llvm/test/MC/COFF/cv-def-range-gap.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# This tries to test defrange gap edge cases.
diff --git a/llvm/test/MC/COFF/cv-def-range.s b/llvm/test/MC/COFF/cv-def-range.s
index 7afdac23ea6..cbd62f3fe3b 100644
--- a/llvm/test/MC/COFF/cv-def-range.s
+++ b/llvm/test/MC/COFF/cv-def-range.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview -codeview-subsection-bytes | FileCheck %s
+# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview --codeview-subsection-bytes | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-empty-file-table.s b/llvm/test/MC/COFF/cv-empty-file-table.s
index 157cd3167d2..2cde1558346 100644
--- a/llvm/test/MC/COFF/cv-empty-file-table.s
+++ b/llvm/test/MC/COFF/cv-empty-file-table.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj -codeview - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj --codeview - | FileCheck %s
.text
.section .debug$S,"dr"
.p2align 2
diff --git a/llvm/test/MC/COFF/cv-empty-linetable.s b/llvm/test/MC/COFF/cv-empty-linetable.s
index 865bc7556be..61ba57ad108 100644
--- a/llvm/test/MC/COFF/cv-empty-linetable.s
+++ b/llvm/test/MC/COFF/cv-empty-linetable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj -codeview - | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 < %s | llvm-readobj --codeview - | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-fpo-csrs.s b/llvm/test/MC/COFF/cv-fpo-csrs.s
index 4235958d66f..1741143ce14 100644
--- a/llvm/test/MC/COFF/cv-fpo-csrs.s
+++ b/llvm/test/MC/COFF/cv-fpo-csrs.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=asm < %s -triple i686-windows-msvc | FileCheck %s --check-prefix=ASM
-# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ
+# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ
.globl _foo
_foo:
diff --git a/llvm/test/MC/COFF/cv-fpo-realign.s b/llvm/test/MC/COFF/cv-fpo-realign.s
index 247cad9334b..df94b133acd 100644
--- a/llvm/test/MC/COFF/cv-fpo-realign.s
+++ b/llvm/test/MC/COFF/cv-fpo-realign.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-windows-msvc -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=i686-windows-msvc -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# Test for .cv_fpo_stackalign. We should generate FPO data that restores CSRs
# at each instruction, and in the last FrameData we should use the '@'
diff --git a/llvm/test/MC/COFF/cv-fpo-setframe.s b/llvm/test/MC/COFF/cv-fpo-setframe.s
index 229a4e92320..217248210ce 100644
--- a/llvm/test/MC/COFF/cv-fpo-setframe.s
+++ b/llvm/test/MC/COFF/cv-fpo-setframe.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=asm < %s -triple i686-windows-msvc | FileCheck %s --check-prefix=ASM
-# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ
+# RUN: llvm-mc -filetype=obj < %s -triple i686-windows-msvc | llvm-readobj --codeview | FileCheck %s --check-prefix=OBJ
.globl _foo
_foo:
diff --git a/llvm/test/MC/COFF/cv-inline-linetable-infloop.s b/llvm/test/MC/COFF/cv-inline-linetable-infloop.s
index 6b8e708befc..3f5f1f53898 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable-infloop.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable-infloop.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# CHECK: InlineSiteSym {
# CHECK: BinaryAnnotations [
diff --git a/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s b/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s
index bfb745bd9bb..0ad3559beb7 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable-unlikely.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-windows -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=x86_64-windows -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
# C source to generate the assembly:
# volatile int unlikely_cond = 0;
diff --git a/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s b/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s
index ab184602c86..b76028e0abf 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable-unreachable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-inline-linetable.s b/llvm/test/MC/COFF/cv-inline-linetable.s
index c5e28c4d078..460c2e9ba2a 100644
--- a/llvm/test/MC/COFF/cv-inline-linetable.s
+++ b/llvm/test/MC/COFF/cv-inline-linetable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj -codeview | FileCheck %s
+# RUN: llvm-mc -triple=i686-pc-win32 -filetype=obj < %s | llvm-readobj --codeview | FileCheck %s
.text
.def @feat.00;
.scl 3;
diff --git a/llvm/test/MC/COFF/cv-loc-unreachable-2.s b/llvm/test/MC/COFF/cv-loc-unreachable-2.s
index 15b3038001e..be96e82fa1b 100644
--- a/llvm/test/MC/COFF/cv-loc-unreachable-2.s
+++ b/llvm/test/MC/COFF/cv-loc-unreachable-2.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s
+# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s
# Based on the other cv-loc-unreachable-2.s, but with other code in the same
# section afterwards. We had negative label difference assertions when .cv_loc
diff --git a/llvm/test/MC/COFF/cv-loc-unreachable.s b/llvm/test/MC/COFF/cv-loc-unreachable.s
index de270690adb..945e519f506 100644
--- a/llvm/test/MC/COFF/cv-loc-unreachable.s
+++ b/llvm/test/MC/COFF/cv-loc-unreachable.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s
+# RUN: llvm-mc < %s -triple=i686-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s
# Original source, slightly modified with an extra .cv_loc directive (at EXTRA
# below) that was causing assertions:
diff --git a/llvm/test/MC/COFF/cv-loc.s b/llvm/test/MC/COFF/cv-loc.s
index 01d5d02b224..d2e1bba5232 100644
--- a/llvm/test/MC/COFF/cv-loc.s
+++ b/llvm/test/MC/COFF/cv-loc.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj - -codeview | FileCheck %s
+# RUN: llvm-mc < %s -triple=x86_64-pc-win32 -filetype=obj | llvm-readobj - --codeview | FileCheck %s
.section .debug$S
.long 4
diff --git a/llvm/test/MC/COFF/cv-string.s b/llvm/test/MC/COFF/cv-string.s
index b3b670c48e9..e9f2631a374 100644
--- a/llvm/test/MC/COFF/cv-string.s
+++ b/llvm/test/MC/COFF/cv-string.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple=i686-windows-msvc %s -filetype=obj -o %t.obj
-# RUN: llvm-readobj -codeview %t.obj | FileCheck %s
+# RUN: llvm-readobj --codeview %t.obj | FileCheck %s
# The .cv_string directive mainly exists as a convenience for manually writing
# FPO data in assembler. Test that we can write FPO data using this directive,
diff --git a/llvm/test/MC/COFF/diff.s b/llvm/test/MC/COFF/diff.s
index f89e4ed8901..2fb48ccc4ee 100644
--- a/llvm/test/MC/COFF/diff.s
+++ b/llvm/test/MC/COFF/diff.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-mingw32 %s | llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-mingw32 %s | llvm-readobj -S --sr --sd | FileCheck %s
// COFF resolves differences between labels in the same section, unless that
// label is declared with function type.
diff --git a/llvm/test/MC/COFF/directive-section-characteristics.ll b/llvm/test/MC/COFF/directive-section-characteristics.ll
index eed2dbf598e..d47103f22cc 100644
--- a/llvm/test/MC/COFF/directive-section-characteristics.ll
+++ b/llvm/test/MC/COFF/directive-section-characteristics.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple i686-windows -filetype obj -o - %s | llvm-readobj -sections \
+; RUN: llc -mtriple i686-windows -filetype obj -o - %s | llvm-readobj --sections \
; RUN: | FileCheck %s
define dllexport void @function() {
diff --git a/llvm/test/MC/COFF/early-dce.s b/llvm/test/MC/COFF/early-dce.s
index ec1a9bda76f..19788390c20 100644
--- a/llvm/test/MC/COFF/early-dce.s
+++ b/llvm/test/MC/COFF/early-dce.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -triple i686-windows -g -filetype obj -o - %s \
-# RUN: | llvm-readobj -s -t | FileCheck %s
+# RUN: | llvm-readobj -S -t | FileCheck %s
.section .rdata
diff --git a/llvm/test/MC/COFF/eh-frame.s b/llvm/test/MC/COFF/eh-frame.s
index 2c5ff202dc6..e51b4c04410 100644
--- a/llvm/test/MC/COFF/eh-frame.s
+++ b/llvm/test/MC/COFF/eh-frame.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o - | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o - | llvm-readobj -S | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/file.s b/llvm/test/MC/COFF/file.s
index dbe3b024f6c..96a658c073b 100644
--- a/llvm/test/MC/COFF/file.s
+++ b/llvm/test/MC/COFF/file.s
@@ -7,7 +7,7 @@
// RUN: | FileCheck %s
// RUN: llvm-mc -triple i686-windows -filetype obj %s -o - \
-// RUN: | llvm-readobj -symbols | FileCheck %s -check-prefix CHECK-SCN
+// RUN: | llvm-readobj --symbols | FileCheck %s -check-prefix CHECK-SCN
.file "null-padded.asm"
// CHECK: (nx 1) {{0x[0-9]+}} .file
diff --git a/llvm/test/MC/COFF/linkonce.s b/llvm/test/MC/COFF/linkonce.s
index f2e350645bf..d490aa778ed 100644
--- a/llvm/test/MC/COFF/linkonce.s
+++ b/llvm/test/MC/COFF/linkonce.s
@@ -1,7 +1,7 @@
// Test section manipulation via .linkonce directive.
//
-// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
+// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
.section s1
.linkonce
diff --git a/llvm/test/MC/COFF/module-asm.ll b/llvm/test/MC/COFF/module-asm.ll
index bf14dc695b5..900694e0532 100644
--- a/llvm/test/MC/COFF/module-asm.ll
+++ b/llvm/test/MC/COFF/module-asm.ll
@@ -1,8 +1,8 @@
; The purpose of this test is to verify that various module level assembly
; constructs work.
-; RUN: llc -filetype=obj -mtriple i686-pc-win32 %s -o - | llvm-readobj -s -sd | FileCheck %s
-; RUN: llc -filetype=obj -mtriple x86_64-pc-win32 %s -o - | llvm-readobj -s -sd | FileCheck %s
+; RUN: llc -filetype=obj -mtriple i686-pc-win32 %s -o - | llvm-readobj -S --sd | FileCheck %s
+; RUN: llc -filetype=obj -mtriple x86_64-pc-win32 %s -o - | llvm-readobj -S --sd | FileCheck %s
module asm ".text"
module asm "_foo:"
diff --git a/llvm/test/MC/COFF/pr28462.s b/llvm/test/MC/COFF/pr28462.s
index 271963d01c5..4289d7b2abb 100644
--- a/llvm/test/MC/COFF/pr28462.s
+++ b/llvm/test/MC/COFF/pr28462.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-windows-msvc < %s | llvm-readobj -s --section-data | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-windows-msvc < %s | llvm-readobj -S --section-data | FileCheck %s
.text
.set var, 42
diff --git a/llvm/test/MC/COFF/secidx.s b/llvm/test/MC/COFF/secidx.s
index 022804d8219..736cb8c80a8 100644
--- a/llvm/test/MC/COFF/secidx.s
+++ b/llvm/test/MC/COFF/secidx.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s -sr | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S --sr | FileCheck %s
// check that we produce the correct relocation for .secidx
diff --git a/llvm/test/MC/COFF/secrel32-undef.s b/llvm/test/MC/COFF/secrel32-undef.s
index 3a725ab8950..70db082b053 100644
--- a/llvm/test/MC/COFF/secrel32-undef.s
+++ b/llvm/test/MC/COFF/secrel32-undef.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o %t.obj
-# RUN: llvm-readobj -symbols -relocations %t.obj | FileCheck %s
+# RUN: llvm-readobj --symbols -r %t.obj | FileCheck %s
# Previously .secrel32 and .secidx relocations against undefined symbols
# resulted in an error. That was a mistake. The linker is fully capable of
diff --git a/llvm/test/MC/COFF/secrel32.s b/llvm/test/MC/COFF/secrel32.s
index deadfe09e0e..d3d59f750f0 100644
--- a/llvm/test/MC/COFF/secrel32.s
+++ b/llvm/test/MC/COFF/secrel32.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -s -sr | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -S --sr | FileCheck %s
// check that we produce the correct relocation for .secrel32
diff --git a/llvm/test/MC/COFF/section-comdat.s b/llvm/test/MC/COFF/section-comdat.s
index 923c23ab95a..d4681d5388f 100644
--- a/llvm/test/MC/COFF/section-comdat.s
+++ b/llvm/test/MC/COFF/section-comdat.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -t | FileCheck %s
+// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -t | FileCheck %s
.section assocSec, "dr", discard, "assocSym"
.global assocSym
diff --git a/llvm/test/MC/COFF/section-name-encoding.s b/llvm/test/MC/COFF/section-name-encoding.s
index 73ab4bdb770..09dd02000c3 100644
--- a/llvm/test/MC/COFF/section-name-encoding.s
+++ b/llvm/test/MC/COFF/section-name-encoding.s
@@ -5,7 +5,7 @@
// (8, 999999]: base 10 string table index (/9999999)
// (999999, 0xFFFFFFFF]: base 64 string table index (//AAAAAA)
//
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s
// Raw encoding
diff --git a/llvm/test/MC/COFF/section.s b/llvm/test/MC/COFF/section.s
index 409c6446cb4..b7b5422babd 100644
--- a/llvm/test/MC/COFF/section.s
+++ b/llvm/test/MC/COFF/section.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -triple i386-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S | FileCheck %s
.section .foo$bar; .long 1
.section .foo@bar; .long 1
diff --git a/llvm/test/MC/COFF/seh-align1.s b/llvm/test/MC/COFF/seh-align1.s
index aafc6ede085..09ee7697c4f 100644
--- a/llvm/test/MC/COFF/seh-align1.s
+++ b/llvm/test/MC/COFF/seh-align1.s
@@ -1,6 +1,6 @@
// This test checks the alignment and padding of the unwind info.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/seh-align2.s b/llvm/test/MC/COFF/seh-align2.s
index 5e6c49a720c..fab1c30d0e5 100644
--- a/llvm/test/MC/COFF/seh-align2.s
+++ b/llvm/test/MC/COFF/seh-align2.s
@@ -1,6 +1,6 @@
// This test checks the alignment and padding of the unwind info.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/seh-align3.s b/llvm/test/MC/COFF/seh-align3.s
index 238b5de3564..34a2fe3aef7 100644
--- a/llvm/test/MC/COFF/seh-align3.s
+++ b/llvm/test/MC/COFF/seh-align3.s
@@ -1,6 +1,6 @@
// This test checks the alignment and padding of the unwind info.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -sd -sr -u | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S --sd --sr -u | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/seh-linkonce.s b/llvm/test/MC/COFF/seh-linkonce.s
index 3352d68b3cf..9cd37bb90d4 100644
--- a/llvm/test/MC/COFF/seh-linkonce.s
+++ b/llvm/test/MC/COFF/seh-linkonce.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -sections -section-symbols | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj --sections --section-symbols | FileCheck %s
.text
.def weak_func;
diff --git a/llvm/test/MC/COFF/seh-section-2.s b/llvm/test/MC/COFF/seh-section-2.s
index 650c5b5105b..b9105829648 100644
--- a/llvm/test/MC/COFF/seh-section-2.s
+++ b/llvm/test/MC/COFF/seh-section-2.s
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -symbols | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj --symbols | FileCheck %s
# This assembly should make an object with two .text sections, two .xdata
# sections, and two .pdata sections.
diff --git a/llvm/test/MC/COFF/seh-section.s b/llvm/test/MC/COFF/seh-section.s
index 711b3eaccef..7d3609d327a 100644
--- a/llvm/test/MC/COFF/seh-section.s
+++ b/llvm/test/MC/COFF/seh-section.s
@@ -1,6 +1,6 @@
// This test ensures functions in custom sections get unwind info emitted in a
// distinct .xdata section.
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -s -sd | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -S --sd | FileCheck %s
// CHECK: Name: .xdata
// CHECK-NEXT: VirtualSize
diff --git a/llvm/test/MC/COFF/seh.s b/llvm/test/MC/COFF/seh.s
index cd884b4fa00..959ac6413d3 100644
--- a/llvm/test/MC/COFF/seh.s
+++ b/llvm/test/MC/COFF/seh.s
@@ -1,6 +1,6 @@
// This test checks that the SEH directives emit the correct unwind data.
-// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -s -u -r | FileCheck %s
+// RUN: llvm-mc -triple x86_64-pc-win32 -filetype=obj %s | llvm-readobj -S -u -r | FileCheck %s
// CHECK: Sections [
// CHECK: Section {
diff --git a/llvm/test/MC/COFF/simple-fixups.s b/llvm/test/MC/COFF/simple-fixups.s
index c1556afb5c0..77dd47b3059 100644
--- a/llvm/test/MC/COFF/simple-fixups.s
+++ b/llvm/test/MC/COFF/simple-fixups.s
@@ -2,8 +2,8 @@
// references to functions. Failing to do so might cause pointer-to-function
// equality to fail if /INCREMENTAL links are used.
-// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple i686-pc-win32 %s | llvm-readobj -s | FileCheck %s
-// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple x86_64-pc-win32 %s | llvm-readobj -s | FileCheck %s
+// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple i686-pc-win32 %s | llvm-readobj -S | FileCheck %s
+// RUN: llvm-mc -filetype=obj -incremental-linker-compatible -triple x86_64-pc-win32 %s | llvm-readobj -S | FileCheck %s
.def _foo;
.scl 2;
diff --git a/llvm/test/MC/COFF/symbol-fragment-offset-64.s b/llvm/test/MC/COFF/symbol-fragment-offset-64.s
index 94e7d07965b..0e86aaa0227 100644
--- a/llvm/test/MC/COFF/symbol-fragment-offset-64.s
+++ b/llvm/test/MC/COFF/symbol-fragment-offset-64.s
@@ -1,7 +1,7 @@
// The purpose of this test is to see if the COFF object writer is emitting the
// proper relocations for multiple pieces of data in a single data fragment.
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
diff --git a/llvm/test/MC/COFF/symbol-fragment-offset.s b/llvm/test/MC/COFF/symbol-fragment-offset.s
index 5875bf47f92..2784768168e 100644
--- a/llvm/test/MC/COFF/symbol-fragment-offset.s
+++ b/llvm/test/MC/COFF/symbol-fragment-offset.s
@@ -1,7 +1,7 @@
// The purpose of this test is to see if the COFF object writer is emitting the
// proper relocations for multiple pieces of data in a single data fragment.
-// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -s -sr -sd -t | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s | llvm-readobj -h -S --sr --sd -t | FileCheck %s
.def _main;
.scl 2;
OpenPOWER on IntegriCloud