summaryrefslogtreecommitdiffstats
path: root/llvm/test/MC/ARM
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/test/MC/ARM')
-rw-r--r--llvm/test/MC/ARM/2010-11-30-reloc-movt.s2
-rw-r--r--llvm/test/MC/ARM/CheckDataSymbol.s2
-rw-r--r--llvm/test/MC/ARM/Windows/multiple-text-sections.s2
-rw-r--r--llvm/test/MC/ARM/Windows/text-attributes.s2
-rw-r--r--llvm/test/MC/ARM/Windows/thumb-attributes.s2
-rw-r--r--llvm/test/MC/ARM/coff-file.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv2.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv2a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv3.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv3m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv4.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv4t.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv5.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv5t.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv5te.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6-m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6k.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6t2.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv6z.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7-a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7-m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7-r.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7e-m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7em.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7m.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv7r.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv8-a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv8.2-a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-armv8a.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-iwmmxt.s2
-rw-r--r--llvm/test/MC/ARM/directive-arch-iwmmxt2.s2
-rw-r--r--llvm/test/MC/ARM/directive-cpu.s2
-rw-r--r--llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s2
-rw-r--r--llvm/test/MC/ARM/directive-eabi_attribute.s2
-rw-r--r--llvm/test/MC/ARM/directive-even.s2
-rw-r--r--llvm/test/MC/ARM/directive-fpu-multiple.s2
-rw-r--r--llvm/test/MC/ARM/directive-fpu.s2
-rw-r--r--llvm/test/MC/ARM/directive-object_arch-2.s2
-rw-r--r--llvm/test/MC/ARM/directive-object_arch.s2
-rw-r--r--llvm/test/MC/ARM/eh-compact-pr0.s2
-rw-r--r--llvm/test/MC/ARM/eh-compact-pr1.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-cantunwind.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-handlerdata.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-integrated-test.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-movsp.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-multiple-offsets.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-pad.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-personality.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-personalityindex.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-save.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-section-comdat.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-section-multiple-func.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-section.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-setfp.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-text-section.s2
-rw-r--r--llvm/test/MC/ARM/eh-directive-vsave.s2
-rw-r--r--llvm/test/MC/ARM/eh-link.s2
-rw-r--r--llvm/test/MC/ARM/elf-thumbfunc-reloc2.s2
-rw-r--r--llvm/test/MC/ARM/inst-directive.s4
-rw-r--r--llvm/test/MC/ARM/mappingsymbols.s18
64 files changed, 73 insertions, 73 deletions
diff --git a/llvm/test/MC/ARM/2010-11-30-reloc-movt.s b/llvm/test/MC/ARM/2010-11-30-reloc-movt.s
index 9f0553af182..a83465edc02 100644
--- a/llvm/test/MC/ARM/2010-11-30-reloc-movt.s
+++ b/llvm/test/MC/ARM/2010-11-30-reloc-movt.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc %s -triple=armv7-linux-gnueabi -filetype=obj -o - | \
-// RUN: llvm-readobj -s -sr -sd | FileCheck %s
+// RUN: llvm-readobj -S --sr --sd | FileCheck %s
.syntax unified
.eabi_attribute 6, 10
diff --git a/llvm/test/MC/ARM/CheckDataSymbol.s b/llvm/test/MC/ARM/CheckDataSymbol.s
index 67930cc77b5..9fb2d018339 100644
--- a/llvm/test/MC/ARM/CheckDataSymbol.s
+++ b/llvm/test/MC/ARM/CheckDataSymbol.s
@@ -1,6 +1,6 @@
# RUN: llvm-mc -filetype=obj -assemble \
# RUN: -triple=arm-arm-none-eabi -mcpu=cortex-a9 %s -o - \
-# RUN: | llvm-readobj -s -t - | FileCheck %s
+# RUN: | llvm-readobj -S -t - | FileCheck %s
# CHECK: Name: $d.1 ({{[1-9][0-9]+}})
# CHECK-NEXT: Value: 0x4
# CHECK-NEXT: Size: 0
diff --git a/llvm/test/MC/ARM/Windows/multiple-text-sections.s b/llvm/test/MC/ARM/Windows/multiple-text-sections.s
index 241eee4bcad..6359f9cf254 100644
--- a/llvm/test/MC/ARM/Windows/multiple-text-sections.s
+++ b/llvm/test/MC/ARM/Windows/multiple-text-sections.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s - | FileCheck %s
+@ RUN: | llvm-readobj -S - | FileCheck %s
.syntax unified
.text
diff --git a/llvm/test/MC/ARM/Windows/text-attributes.s b/llvm/test/MC/ARM/Windows/text-attributes.s
index 62aa028789f..ea5ee8e95e0 100644
--- a/llvm/test/MC/ARM/Windows/text-attributes.s
+++ b/llvm/test/MC/ARM/Windows/text-attributes.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s - | FileCheck %s
+@ RUN: | llvm-readobj -S - | FileCheck %s
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/Windows/thumb-attributes.s b/llvm/test/MC/ARM/Windows/thumb-attributes.s
index 6396862f00a..5b589a3a669 100644
--- a/llvm/test/MC/ARM/Windows/thumb-attributes.s
+++ b/llvm/test/MC/ARM/Windows/thumb-attributes.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple thumbv7-windows-itanium -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s - | FileCheck %s
+@ RUN: | llvm-readobj -S - | FileCheck %s
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/coff-file.s b/llvm/test/MC/ARM/coff-file.s
index d3f26f4c8f7..9caf0d4bcac 100644
--- a/llvm/test/MC/ARM/coff-file.s
+++ b/llvm/test/MC/ARM/coff-file.s
@@ -2,7 +2,7 @@
// RUN: | FileCheck %s
// RUN: llvm-mc -triple thumbv7-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/ARM/directive-arch-armv2.s b/llvm/test/MC/ARM/directive-arch-armv2.s
index f6dc20c0a36..ceec7cfeda9 100644
--- a/llvm/test/MC/ARM/directive-arch-armv2.s
+++ b/llvm/test/MC/ARM/directive-arch-armv2.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv2
diff --git a/llvm/test/MC/ARM/directive-arch-armv2a.s b/llvm/test/MC/ARM/directive-arch-armv2a.s
index bb0a693dc84..c07718e2edb 100644
--- a/llvm/test/MC/ARM/directive-arch-armv2a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv2a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv2a
diff --git a/llvm/test/MC/ARM/directive-arch-armv3.s b/llvm/test/MC/ARM/directive-arch-armv3.s
index aeec638eac8..ad773c9cfaf 100644
--- a/llvm/test/MC/ARM/directive-arch-armv3.s
+++ b/llvm/test/MC/ARM/directive-arch-armv3.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv3
diff --git a/llvm/test/MC/ARM/directive-arch-armv3m.s b/llvm/test/MC/ARM/directive-arch-armv3m.s
index fda8db52e7b..be587827749 100644
--- a/llvm/test/MC/ARM/directive-arch-armv3m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv3m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv3m
diff --git a/llvm/test/MC/ARM/directive-arch-armv4.s b/llvm/test/MC/ARM/directive-arch-armv4.s
index fb838428403..78e97e7aee4 100644
--- a/llvm/test/MC/ARM/directive-arch-armv4.s
+++ b/llvm/test/MC/ARM/directive-arch-armv4.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv4
diff --git a/llvm/test/MC/ARM/directive-arch-armv4t.s b/llvm/test/MC/ARM/directive-arch-armv4t.s
index 33a5ae38575..11f06ef2025 100644
--- a/llvm/test/MC/ARM/directive-arch-armv4t.s
+++ b/llvm/test/MC/ARM/directive-arch-armv4t.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv4t
diff --git a/llvm/test/MC/ARM/directive-arch-armv5.s b/llvm/test/MC/ARM/directive-arch-armv5.s
index 73a8c95db79..a3cbaa93b95 100644
--- a/llvm/test/MC/ARM/directive-arch-armv5.s
+++ b/llvm/test/MC/ARM/directive-arch-armv5.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv5
diff --git a/llvm/test/MC/ARM/directive-arch-armv5t.s b/llvm/test/MC/ARM/directive-arch-armv5t.s
index 66a75c4c89e..fc1370f98cd 100644
--- a/llvm/test/MC/ARM/directive-arch-armv5t.s
+++ b/llvm/test/MC/ARM/directive-arch-armv5t.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv5t
diff --git a/llvm/test/MC/ARM/directive-arch-armv5te.s b/llvm/test/MC/ARM/directive-arch-armv5te.s
index f3932d84a56..42229206087 100644
--- a/llvm/test/MC/ARM/directive-arch-armv5te.s
+++ b/llvm/test/MC/ARM/directive-arch-armv5te.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv5te
diff --git a/llvm/test/MC/ARM/directive-arch-armv6-m.s b/llvm/test/MC/ARM/directive-arch-armv6-m.s
index d89a627740b..bc33f330eae 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6-m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6-m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6-m
diff --git a/llvm/test/MC/ARM/directive-arch-armv6.s b/llvm/test/MC/ARM/directive-arch-armv6.s
index fb489207355..04a963edaaa 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6
diff --git a/llvm/test/MC/ARM/directive-arch-armv6k.s b/llvm/test/MC/ARM/directive-arch-armv6k.s
index ee433fa283e..1af24942e13 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6k.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6k.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6k
diff --git a/llvm/test/MC/ARM/directive-arch-armv6t2.s b/llvm/test/MC/ARM/directive-arch-armv6t2.s
index 85f4491b0c6..dd9905cf1b8 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6t2.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6t2.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6t2
diff --git a/llvm/test/MC/ARM/directive-arch-armv6z.s b/llvm/test/MC/ARM/directive-arch-armv6z.s
index efb8f8bfe9d..509040f4578 100644
--- a/llvm/test/MC/ARM/directive-arch-armv6z.s
+++ b/llvm/test/MC/ARM/directive-arch-armv6z.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv6z
diff --git a/llvm/test/MC/ARM/directive-arch-armv7-a.s b/llvm/test/MC/ARM/directive-arch-armv7-a.s
index 792429a4e04..6c1f8fcafd6 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7-a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7-a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7-a
diff --git a/llvm/test/MC/ARM/directive-arch-armv7-m.s b/llvm/test/MC/ARM/directive-arch-armv7-m.s
index 058f23ba2be..ac41bab5ca0 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7-m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7-m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7-m
diff --git a/llvm/test/MC/ARM/directive-arch-armv7-r.s b/llvm/test/MC/ARM/directive-arch-armv7-r.s
index 99481f70c5f..a7b57542610 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7-r.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7-r.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7-r
diff --git a/llvm/test/MC/ARM/directive-arch-armv7.s b/llvm/test/MC/ARM/directive-arch-armv7.s
index 0cd499666ea..104c7fec548 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7
diff --git a/llvm/test/MC/ARM/directive-arch-armv7a.s b/llvm/test/MC/ARM/directive-arch-armv7a.s
index 3bb202fb278..9189dedcbb5 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7a
diff --git a/llvm/test/MC/ARM/directive-arch-armv7e-m.s b/llvm/test/MC/ARM/directive-arch-armv7e-m.s
index f7c5d67b8fe..bebf2dcda65 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7e-m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7e-m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7e-m
diff --git a/llvm/test/MC/ARM/directive-arch-armv7em.s b/llvm/test/MC/ARM/directive-arch-armv7em.s
index f37398106de..ac6d1cc59df 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7em.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7em.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7em
diff --git a/llvm/test/MC/ARM/directive-arch-armv7m.s b/llvm/test/MC/ARM/directive-arch-armv7m.s
index 0e9f546387b..aafb3ee31e8 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7m.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7m.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7m
diff --git a/llvm/test/MC/ARM/directive-arch-armv7r.s b/llvm/test/MC/ARM/directive-arch-armv7r.s
index 9009d134128..d99b5da5074 100644
--- a/llvm/test/MC/ARM/directive-arch-armv7r.s
+++ b/llvm/test/MC/ARM/directive-arch-armv7r.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv7r
diff --git a/llvm/test/MC/ARM/directive-arch-armv8-a.s b/llvm/test/MC/ARM/directive-arch-armv8-a.s
index 636378155e7..1b5152a4fd4 100644
--- a/llvm/test/MC/ARM/directive-arch-armv8-a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv8-a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv8-a
diff --git a/llvm/test/MC/ARM/directive-arch-armv8.2-a.s b/llvm/test/MC/ARM/directive-arch-armv8.2-a.s
index c9f4469fb0a..1118b126171 100644
--- a/llvm/test/MC/ARM/directive-arch-armv8.2-a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv8.2-a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv8.2-a
diff --git a/llvm/test/MC/ARM/directive-arch-armv8a.s b/llvm/test/MC/ARM/directive-arch-armv8a.s
index 4a1915c5343..0226231afc9 100644
--- a/llvm/test/MC/ARM/directive-arch-armv8a.s
+++ b/llvm/test/MC/ARM/directive-arch-armv8a.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch armv8a
diff --git a/llvm/test/MC/ARM/directive-arch-iwmmxt.s b/llvm/test/MC/ARM/directive-arch-iwmmxt.s
index c54846dbcc2..2a15bbe537c 100644
--- a/llvm/test/MC/ARM/directive-arch-iwmmxt.s
+++ b/llvm/test/MC/ARM/directive-arch-iwmmxt.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch iwmmxt
diff --git a/llvm/test/MC/ARM/directive-arch-iwmmxt2.s b/llvm/test/MC/ARM/directive-arch-iwmmxt2.s
index a4e59b5ba27..dec5abad8b7 100644
--- a/llvm/test/MC/ARM/directive-arch-iwmmxt2.s
+++ b/llvm/test/MC/ARM/directive-arch-iwmmxt2.s
@@ -6,7 +6,7 @@
@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
@ RUN: | FileCheck %s -check-prefix CHECK-ASM
@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.arch iwmmxt2
diff --git a/llvm/test/MC/ARM/directive-cpu.s b/llvm/test/MC/ARM/directive-cpu.s
index d81a03e5e29..8c95d7b3d86 100644
--- a/llvm/test/MC/ARM/directive-cpu.s
+++ b/llvm/test/MC/ARM/directive-cpu.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ CHECK: Name: .ARM.attribute
@ CHECK: SectionData (
diff --git a/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s b/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s
index e2c50997275..b659cd2c285 100644
--- a/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s
+++ b/llvm/test/MC/ARM/directive-eabi_attribute-overwrite.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s -check-prefix CHECK-ATTR
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/directive-eabi_attribute.s b/llvm/test/MC/ARM/directive-eabi_attribute.s
index e848f774b34..c25b0ae152a 100644
--- a/llvm/test/MC/ARM/directive-eabi_attribute.s
+++ b/llvm/test/MC/ARM/directive-eabi_attribute.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s --check-prefix=CHECK-OBJ
.syntax unified
.thumb
diff --git a/llvm/test/MC/ARM/directive-even.s b/llvm/test/MC/ARM/directive-even.s
index b92c9f95f5d..e8152e5d20d 100644
--- a/llvm/test/MC/ARM/directive-even.s
+++ b/llvm/test/MC/ARM/directive-even.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -s -sd \
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -S --sd \
@ RUN: | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/directive-fpu-multiple.s b/llvm/test/MC/ARM/directive-fpu-multiple.s
index 50389a11532..eaa5af97f7a 100644
--- a/llvm/test/MC/ARM/directive-fpu-multiple.s
+++ b/llvm/test/MC/ARM/directive-fpu-multiple.s
@@ -3,7 +3,7 @@
@ The later .fpu directive should overwrite the earlier one.
@ We also check here that all the .fpu directives that we expect to work do work
-@ RUN: llvm-mc -triple arm-eabi -filetype obj %s | llvm-readobj -arm-attributes \
+@ RUN: llvm-mc -triple arm-eabi -filetype obj %s | llvm-readobj --arm-attributes \
@ RUN: | FileCheck %s -check-prefix CHECK-ATTR
.fpu none
diff --git a/llvm/test/MC/ARM/directive-fpu.s b/llvm/test/MC/ARM/directive-fpu.s
index 24e159c74fc..f7fea24edcb 100644
--- a/llvm/test/MC/ARM/directive-fpu.s
+++ b/llvm/test/MC/ARM/directive-fpu.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc < %s -triple armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ CHECK: Name: .ARM.attribute
@ CHECK: SectionData (
diff --git a/llvm/test/MC/ARM/directive-object_arch-2.s b/llvm/test/MC/ARM/directive-object_arch-2.s
index f0596f12385..9f661182ffc 100644
--- a/llvm/test/MC/ARM/directive-object_arch-2.s
+++ b/llvm/test/MC/ARM/directive-object_arch-2.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/directive-object_arch.s b/llvm/test/MC/ARM/directive-object_arch.s
index c211a3bb57e..3b099408555 100644
--- a/llvm/test/MC/ARM/directive-object_arch.s
+++ b/llvm/test/MC/ARM/directive-object_arch.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes | FileCheck %s
+@ RUN: | llvm-readobj --arm-attributes | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/eh-compact-pr0.s b/llvm/test/MC/ARM/eh-compact-pr0.s
index 66fd4a4efed..c018c94bf4d 100644
--- a/llvm/test/MC/ARM/eh-compact-pr0.s
+++ b/llvm/test/MC/ARM/eh-compact-pr0.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-compact-pr1.s b/llvm/test/MC/ARM/eh-compact-pr1.s
index 9f40593cf43..d404a4f351b 100644
--- a/llvm/test/MC/ARM/eh-compact-pr1.s
+++ b/llvm/test/MC/ARM/eh-compact-pr1.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the compact pr1 model
diff --git a/llvm/test/MC/ARM/eh-directive-cantunwind.s b/llvm/test/MC/ARM/eh-directive-cantunwind.s
index 499c2c44dfc..60cbd852f6d 100644
--- a/llvm/test/MC/ARM/eh-directive-cantunwind.s
+++ b/llvm/test/MC/ARM/eh-directive-cantunwind.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the .cantunwind directive
diff --git a/llvm/test/MC/ARM/eh-directive-handlerdata.s b/llvm/test/MC/ARM/eh-directive-handlerdata.s
index c4352e5dee5..ce87b4b2d14 100644
--- a/llvm/test/MC/ARM/eh-directive-handlerdata.s
+++ b/llvm/test/MC/ARM/eh-directive-handlerdata.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-integrated-test.s b/llvm/test/MC/ARM/eh-directive-integrated-test.s
index df2b290fec9..d69d43a2625 100644
--- a/llvm/test/MC/ARM/eh-directive-integrated-test.s
+++ b/llvm/test/MC/ARM/eh-directive-integrated-test.s
@@ -20,7 +20,7 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@-------------------------------------------------------------------------------
diff --git a/llvm/test/MC/ARM/eh-directive-movsp.s b/llvm/test/MC/ARM/eh-directive-movsp.s
index 620f5b769d4..bbb9e2cfeb2 100644
--- a/llvm/test/MC/ARM/eh-directive-movsp.s
+++ b/llvm/test/MC/ARM/eh-directive-movsp.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -s -sd \
+@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -S --sd \
@ RUN: | FileCheck %s
.syntax unified
diff --git a/llvm/test/MC/ARM/eh-directive-multiple-offsets.s b/llvm/test/MC/ARM/eh-directive-multiple-offsets.s
index 6e81f41665a..25c40f94207 100644
--- a/llvm/test/MC/ARM/eh-directive-multiple-offsets.s
+++ b/llvm/test/MC/ARM/eh-directive-multiple-offsets.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check for different combination of .setfp, .pad, .save and .vsave.
diff --git a/llvm/test/MC/ARM/eh-directive-pad.s b/llvm/test/MC/ARM/eh-directive-pad.s
index f8263e6621f..ef6c34e8d18 100644
--- a/llvm/test/MC/ARM/eh-directive-pad.s
+++ b/llvm/test/MC/ARM/eh-directive-pad.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check for different stack pointer offsets.
diff --git a/llvm/test/MC/ARM/eh-directive-personality.s b/llvm/test/MC/ARM/eh-directive-personality.s
index 84e62bdfd68..826c10d696a 100644
--- a/llvm/test/MC/ARM/eh-directive-personality.s
+++ b/llvm/test/MC/ARM/eh-directive-personality.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-personalityindex.s b/llvm/test/MC/ARM/eh-directive-personalityindex.s
index 5d537bb04d3..36c0ac3882f 100644
--- a/llvm/test/MC/ARM/eh-directive-personalityindex.s
+++ b/llvm/test/MC/ARM/eh-directive-personalityindex.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc -triple armv7-linux-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -s -sd -sr > %t
+@ RUN: | llvm-readobj -S --sd --sr > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-save.s b/llvm/test/MC/ARM/eh-directive-save.s
index 652a7bb56c5..539d73d57a2 100644
--- a/llvm/test/MC/ARM/eh-directive-save.s
+++ b/llvm/test/MC/ARM/eh-directive-save.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check the .save directive
diff --git a/llvm/test/MC/ARM/eh-directive-section-comdat.s b/llvm/test/MC/ARM/eh-directive-section-comdat.s
index 8b7f32eaece..2ab5d8ccc9e 100644
--- a/llvm/test/MC/ARM/eh-directive-section-comdat.s
+++ b/llvm/test/MC/ARM/eh-directive-section-comdat.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -t | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr -t | FileCheck %s
@ Check the .group section for the function in comdat section.
diff --git a/llvm/test/MC/ARM/eh-directive-section-multiple-func.s b/llvm/test/MC/ARM/eh-directive-section-multiple-func.s
index 53c498ab87b..a75f9fe7bad 100644
--- a/llvm/test/MC/ARM/eh-directive-section-multiple-func.s
+++ b/llvm/test/MC/ARM/eh-directive-section-multiple-func.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -t > %t
+@ RUN: | llvm-readobj -S --sd --sr -t > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-section.s b/llvm/test/MC/ARM/eh-directive-section.s
index bd41fbe5eee..29d35662c9a 100644
--- a/llvm/test/MC/ARM/eh-directive-section.s
+++ b/llvm/test/MC/ARM/eh-directive-section.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -t > %t
+@ RUN: | llvm-readobj -S --sd --sr -t > %t
@ RUN: FileCheck %s < %t
@ RUN: FileCheck --check-prefix=RELOC %s < %t
diff --git a/llvm/test/MC/ARM/eh-directive-setfp.s b/llvm/test/MC/ARM/eh-directive-setfp.s
index ce7fe10b43c..0d9d9e60076 100644
--- a/llvm/test/MC/ARM/eh-directive-setfp.s
+++ b/llvm/test/MC/ARM/eh-directive-setfp.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s
+@ RUN: | llvm-readobj -S --sd | FileCheck %s
@ Check for .setfp directive.
diff --git a/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s b/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s
index 7ab401c5043..4111984d2f6 100644
--- a/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s
+++ b/llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr -r -t | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr -r -t | FileCheck %s
@ Check whether the section is switched back or not.
diff --git a/llvm/test/MC/ARM/eh-directive-text-section.s b/llvm/test/MC/ARM/eh-directive-text-section.s
index 10ccdd54e50..b6658166365 100644
--- a/llvm/test/MC/ARM/eh-directive-text-section.s
+++ b/llvm/test/MC/ARM/eh-directive-text-section.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the .fnstart directive and the .fnend directive.
diff --git a/llvm/test/MC/ARM/eh-directive-vsave.s b/llvm/test/MC/ARM/eh-directive-vsave.s
index c9b78d7e276..1b792650866 100644
--- a/llvm/test/MC/ARM/eh-directive-vsave.s
+++ b/llvm/test/MC/ARM/eh-directive-vsave.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd -sr | FileCheck %s
+@ RUN: | llvm-readobj -S --sd --sr | FileCheck %s
@ Check the .vsave directive
diff --git a/llvm/test/MC/ARM/eh-link.s b/llvm/test/MC/ARM/eh-link.s
index 19fe14db5f3..bae17d3e3c8 100644
--- a/llvm/test/MC/ARM/eh-link.s
+++ b/llvm/test/MC/ARM/eh-link.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple=armv7-unknown-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s | FileCheck %s
+@ RUN: | llvm-readobj -S | FileCheck %s
@ Test that the ARM_EXIDX sections point (Link) to the corresponding text
@ sections.
diff --git a/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s b/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s
index 18c13d90332..3136ad98e85 100644
--- a/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s
+++ b/llvm/test/MC/ARM/elf-thumbfunc-reloc2.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc %s -triple=thumbv7-linux-gnueabi \
-// RUN: -filetype=obj -o - | llvm-readobj -s -sd -r -t | \
+// RUN: -filetype=obj -o - | llvm-readobj -S --sd -r -t | \
// RUN: FileCheck %s
// We want to test relocatable thumb function call.
diff --git a/llvm/test/MC/ARM/inst-directive.s b/llvm/test/MC/ARM/inst-directive.s
index d3f2a36408c..290bd7d029e 100644
--- a/llvm/test/MC/ARM/inst-directive.s
+++ b/llvm/test/MC/ARM/inst-directive.s
@@ -1,8 +1,8 @@
@ RUN: llvm-mc %s -triple=armv7-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LE
+@ RUN: | llvm-readobj -S --sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LE
@ RUN: llvm-mc %s -triple=armebv7-linux-gnueabi -filetype=obj -o - \
-@ RUN: | llvm-readobj -s -sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE
+@ RUN: | llvm-readobj -S --sd | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE
.syntax unified
diff --git a/llvm/test/MC/ARM/mappingsymbols.s b/llvm/test/MC/ARM/mappingsymbols.s
index fff8e104781..3727e3ef7f2 100644
--- a/llvm/test/MC/ARM/mappingsymbols.s
+++ b/llvm/test/MC/ARM/mappingsymbols.s
@@ -1,40 +1,40 @@
# Check section containing code and data with permission executable for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/1.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
# Check section containing code and data with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/2.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
# Check section containing code and data with read/write permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/3.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
# Check section containing data with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/4.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing only data with read/write permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/5.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing the ident string with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/ident.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing the attributes with no permissions for the section.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/attr.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MAPPINGSYMBOLS
# Check section containing code and data with no permissions for the section.
# data comes before code.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/6.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s -check-prefix=MIX
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s -check-prefix=MIX
# Check section containing code and data with no permissions for the section.
# data comes before code.
@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %p/Inputs/7.s
-@ RUN: llvm-readobj -elf-output-style=GNU -symbols %t.o | FileCheck %s
+@ RUN: llvm-readelf -symbols %t.o | FileCheck %s
#CHECK: $a
#CHECK: $d
OpenPOWER on IntegriCloud