[llvm-readobj] Change -long-option to --long-option in tests. NFC
We use both -long-option and --long-option in tests. Switch to --long-option for consistency.
In the "llvm-readelf" mode, -long-option is discouraged as it conflicts with grouped short options and it is not accepted by GNU readelf.
While updating the tests, change llvm-readobj -s to llvm-readobj -S to reduce confusion ("s" is --section-headers in llvm-readobj but --symbols in llvm-readelf).
llvm-svn: 359649
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-0.s b/llvm/test/tools/llvm-readobj/ARM/attribute-0.s
index bad2395..2404994 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-0.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-0.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 0
@CHECK: .eabi_attribute 6, 0
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-1.s b/llvm/test/tools/llvm-readobj/ARM/attribute-1.s
index c710bc8..e493a42 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-1.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-1.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 1
@CHECK: .eabi_attribute 6, 1
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-10.s b/llvm/test/tools/llvm-readobj/ARM/attribute-10.s
index 667db8c..570e27b 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-10.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-10.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 10
@CHECK: .eabi_attribute 6, 10
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-11.s b/llvm/test/tools/llvm-readobj/ARM/attribute-11.s
index 2d8e43b..b70e5a0 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-11.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-11.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 11
@CHECK: .eabi_attribute 6, 11
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-12.s b/llvm/test/tools/llvm-readobj/ARM/attribute-12.s
index 4387527..1bedf6dc 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-12.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-12.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 12
@CHECK: .eabi_attribute 6, 12
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-13.s b/llvm/test/tools/llvm-readobj/ARM/attribute-13.s
index 25ac5f1..d3b9fb7 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-13.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-13.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 13
@CHECK: .eabi_attribute 6, 13
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-136.s b/llvm/test/tools/llvm-readobj/ARM/attribute-136.s
index a2d2a9a..5952b34 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-136.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-136.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_compatibility, 136, "Foo Corp"
@CHECK: .eabi_attribute 32, 136
@CHECK-OBJ: Tag: 32
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-14.s b/llvm/test/tools/llvm-readobj/ARM/attribute-14.s
index e0d8e46..aad4433 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-14.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-14.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 14
@CHECK: .eabi_attribute 6, 14
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-15.s b/llvm/test/tools/llvm-readobj/ARM/attribute-15.s
index 7877ce7..efe4c7a 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-15.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-15.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_compatibility, 15, "Longer Corporation NaMe"
@CHECK: .eabi_attribute 32, 15
@CHECK-OBJ: Tag: 32
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-2.s b/llvm/test/tools/llvm-readobj/ARM/attribute-2.s
index 21ee41f..dd7fc9e 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-2.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-2.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 2
@CHECK: .eabi_attribute 6, 2
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-3.s b/llvm/test/tools/llvm-readobj/ARM/attribute-3.s
index ad2de25..3ef7dde 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-3.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-3.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 3
@CHECK: .eabi_attribute 6, 3
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-4.s b/llvm/test/tools/llvm-readobj/ARM/attribute-4.s
index 2c27785..01cd6d4 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-4.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-4.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 4
@CHECK: .eabi_attribute 6, 4
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-5.s b/llvm/test/tools/llvm-readobj/ARM/attribute-5.s
index 97e37e2..cadf1fc 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-5.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-5.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 5
@CHECK: .eabi_attribute 6, 5
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-6.s b/llvm/test/tools/llvm-readobj/ARM/attribute-6.s
index 8da7b99..cf60397 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-6.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-6.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 6
@CHECK: .eabi_attribute 6, 6
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-7.s b/llvm/test/tools/llvm-readobj/ARM/attribute-7.s
index 2fd1b20..36242c0 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-7.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-7.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 7
@CHECK: .eabi_attribute 6, 7
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-8.s b/llvm/test/tools/llvm-readobj/ARM/attribute-8.s
index ac3e3a0..42a6116 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-8.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-8.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 8
@CHECK: .eabi_attribute 6, 8
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-9.s b/llvm/test/tools/llvm-readobj/ARM/attribute-9.s
index 68f6ccb..1c75784 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-9.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-9.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch, 9
@CHECK: .eabi_attribute 6, 9
@CHECK-OBJ: Tag: 6
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-A.s b/llvm/test/tools/llvm-readobj/ARM/attribute-A.s
index 720f56e..8c08c7e 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-A.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-A.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch_profile, 'A'
@CHECK: .eabi_attribute 7, 65
@CHECK-OBJ: Tag: 7
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-M.s b/llvm/test/tools/llvm-readobj/ARM/attribute-M.s
index 7d1e1ef..56c0c95 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-M.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-M.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch_profile, 'M'
@CHECK: .eabi_attribute 7, 77
@CHECK-OBJ: Tag: 7
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-R.s b/llvm/test/tools/llvm-readobj/ARM/attribute-R.s
index 096d557..add4192 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-R.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-R.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch_profile, 'R'
@CHECK: .eabi_attribute 7, 82
@CHECK-OBJ: Tag: 7
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-S.s b/llvm/test/tools/llvm-readobj/ARM/attribute-S.s
index cb90958..0bd4924 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-S.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-S.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_CPU_arch_profile, 'S'
@CHECK: .eabi_attribute 7, 83
@CHECK-OBJ: Tag: 7
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
index daa44c1..cfa426d 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-1.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_conformance, "0"
@CHECK: .eabi_attribute 67, "0"
@CHECK-OBJ: Tag: 67
diff --git a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
index 47c83c0..00d08fb 100644
--- a/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
+++ b/llvm/test/tools/llvm-readobj/ARM/attribute-conformance-2.s
@@ -1,6 +1,6 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
-@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
+@ RUN: | llvm-readobj --arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_conformance, "A.long--non numeric oddity...!!"
@CHECK: .eabi_attribute 67, "A.long--non numeric oddity...!!"
@CHECK-OBJ: Tag: 67
diff --git a/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test b/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test
index 9b077ff..24dcc7c 100644
--- a/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test
+++ b/llvm/test/tools/llvm-readobj/amdgpu-elf-definitions.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -file-headers -program-headers -sections -symbols %p/Inputs/trivial.obj.elf-amdhsa-gfx803 | FileCheck %s
+RUN: llvm-readobj --file-headers -l -S --symbols %p/Inputs/trivial.obj.elf-amdhsa-gfx803 | FileCheck %s
CHECK: Format: ELF64-amdgpu
CHECK: Arch: unknown
diff --git a/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s b/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s
index 054f1dd..a1b5398 100644
--- a/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s
+++ b/llvm/test/tools/llvm-readobj/arm64-many-epilogs.s
@@ -1,6 +1,6 @@
// REQUIRES: aarch64-registered-target
// RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \
-// RUN: | not llvm-readobj -unwind - | FileCheck %s
+// RUN: | not llvm-readobj --unwind - | FileCheck %s
// Older versions of LLVM had a bug where we would accidentally
// truncate the number of epilogue scopes to a uint8_t; make
diff --git a/llvm/test/tools/llvm-readobj/arm64-win-error1.s b/llvm/test/tools/llvm-readobj/arm64-win-error1.s
index cd449ef..4cf3590 100644
--- a/llvm/test/tools/llvm-readobj/arm64-win-error1.s
+++ b/llvm/test/tools/llvm-readobj/arm64-win-error1.s
@@ -3,7 +3,7 @@
// REQUIRES: aarch64-registered-target
// RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \
-// RUN: | llvm-readobj -unwind - | FileCheck %s
+// RUN: | llvm-readobj --unwind - | FileCheck %s
// CHECK: Prologue [
// CHECK: 0xdf ; Bad opcode!
diff --git a/llvm/test/tools/llvm-readobj/arm64-win-error2.s b/llvm/test/tools/llvm-readobj/arm64-win-error2.s
index 93c461d..74a61dd 100644
--- a/llvm/test/tools/llvm-readobj/arm64-win-error2.s
+++ b/llvm/test/tools/llvm-readobj/arm64-win-error2.s
@@ -6,7 +6,7 @@
// REQUIRES: aarch64-registered-target
// RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \
-// RUN: | not llvm-readobj -unwind - 2>&1 | FileCheck %s
+// RUN: | not llvm-readobj --unwind - 2>&1 | FileCheck %s
// CHECK: LLVM ERROR: Malformed unwind data
diff --git a/llvm/test/tools/llvm-readobj/arm64-win-error3.s b/llvm/test/tools/llvm-readobj/arm64-win-error3.s
index 5cbc3d7..8e1e1e1 100644
--- a/llvm/test/tools/llvm-readobj/arm64-win-error3.s
+++ b/llvm/test/tools/llvm-readobj/arm64-win-error3.s
@@ -5,7 +5,7 @@
// REQUIRES: aarch64-registered-target
// RUN: llvm-mc -filetype=obj -triple aarch64-windows %s -o - \
-// RUN: | llvm-readobj -unwind - | FileCheck %s
+// RUN: | llvm-readobj --unwind - | FileCheck %s
// CHECK: Prologue [
// CHECK: Opcode 0xe0 goes past the unwind data
diff --git a/llvm/test/tools/llvm-readobj/broken-group.test b/llvm/test/tools/llvm-readobj/broken-group.test
index 8b8989a..3742fe2 100644
--- a/llvm/test/tools/llvm-readobj/broken-group.test
+++ b/llvm/test/tools/llvm-readobj/broken-group.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s -o %t.o
-# RUN: llvm-readobj --elf-section-groups -elf-output-style=GNU \
+# RUN: llvm-readobj --elf-section-groups --elf-output-style=GNU \
# RUN: %t.o >%tout.log 2>%terr.log
# RUN: FileCheck %s -check-prefix=GNU-STDERR < %terr.log
# GNU-STDERR: Error: section [ 3] in group section [ 4] already in group section [ 2]
diff --git a/llvm/test/tools/llvm-readobj/codeview-inlinees.test b/llvm/test/tools/llvm-readobj/codeview-inlinees.test
index bbbe8b45..9f818df 100644
--- a/llvm/test/tools/llvm-readobj/codeview-inlinees.test
+++ b/llvm/test/tools/llvm-readobj/codeview-inlinees.test
@@ -8,7 +8,7 @@
h();
}
-RUN: llvm-readobj -codeview %p/Inputs/codeview-inlinees.obj | FileCheck %s
+RUN: llvm-readobj --codeview %p/Inputs/codeview-inlinees.obj | FileCheck %s
CHECK: SubSectionType: InlineeLines (0xF6)
CHECK: Inlinee: f (0x1003)
diff --git a/llvm/test/tools/llvm-readobj/codeview-inlining.test b/llvm/test/tools/llvm-readobj/codeview-inlining.test
index 78569935..14c4f1a 100644
--- a/llvm/test/tools/llvm-readobj/codeview-inlining.test
+++ b/llvm/test/tools/llvm-readobj/codeview-inlining.test
@@ -30,7 +30,7 @@
;
; Both a.h and b.h contain "__asm nop".
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/codeview-inlining.obj.coff | FileCheck %s
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/codeview-inlining.obj.coff | FileCheck %s
; FIXME: If we were more clever, we could turn FileIDs into paths.
diff --git a/llvm/test/tools/llvm-readobj/codeview-label.test b/llvm/test/tools/llvm-readobj/codeview-label.test
index 3bf6deb..66afcb3 100644
--- a/llvm/test/tools/llvm-readobj/codeview-label.test
+++ b/llvm/test/tools/llvm-readobj/codeview-label.test
@@ -1,4 +1,4 @@
-; RUN: llvm-readobj -codeview %S/Inputs/codeview-label.obj | FileCheck %s
+; RUN: llvm-readobj --codeview %S/Inputs/codeview-label.obj | FileCheck %s
; CHECK-LABEL: Label (0x1000) {
; CHECK-NEXT: TypeLeafKind: LF_LABEL (0xE)
diff --git a/llvm/test/tools/llvm-readobj/codeview-linetables.test b/llvm/test/tools/llvm-readobj/codeview-linetables.test
index 9256aef..81d193a 100644
--- a/llvm/test/tools/llvm-readobj/codeview-linetables.test
+++ b/llvm/test/tools/llvm-readobj/codeview-linetables.test
@@ -18,13 +18,13 @@
; z();
; }
; using 32-/64-bit versions of CL v17.00.61030 and v18.00.21005.1 respectively.
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-i368 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-i368 \
RUN: | FileCheck %s -check-prefix MFUN32
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-i368 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-i368 \
RUN: | FileCheck %s -check-prefix MFUN32
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-x86_64 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2012-x86_64 \
RUN: | FileCheck %s -check-prefix MFUN64
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-x86_64 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifunction-linetables.obj.coff-2013-x86_64 \
RUN: | FileCheck %s -check-prefix MFUN64
MFUN32: CodeViewDebugInfo [
@@ -343,13 +343,13 @@
; g();
; }
; using 32-/64-bit versions of CL v17.00.61030 and v18.00.21005.1 respectively.
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-i368 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-i368 \
RUN: | FileCheck %s -check-prefix MFILE32
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-i368 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-i368 \
RUN: | FileCheck %s -check-prefix MFILE32
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-x86_64 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2012-x86_64 \
RUN: | FileCheck %s -check-prefix MFILE64
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-x86_64 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/multifile-linetables.obj.coff-2013-x86_64 \
RUN: | FileCheck %s -check-prefix MFILE64
MFILE32: CodeViewDebugInfo [
@@ -523,9 +523,9 @@
; return 0;
; }
; using 32-version of CL v17.00.61030 and v18.00.21005.1 respectively.
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2012-i386 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2012-i386 \
RUN: | FileCheck %s -check-prefix MCOMDAT
-RUN: llvm-readobj -s -codeview -section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2013-i386 \
+RUN: llvm-readobj -S --codeview --section-symbols %p/Inputs/comdat-function-linetables.obj.coff-2013-i386 \
RUN: | FileCheck %s -check-prefix MCOMDAT
MCOMDAT: GlobalProcIdSym {
diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-anon.test b/llvm/test/tools/llvm-readobj/codeview-merging-anon.test
index cf04840..bbc40f9 100644
--- a/llvm/test/tools/llvm-readobj/codeview-merging-anon.test
+++ b/llvm/test/tools/llvm-readobj/codeview-merging-anon.test
@@ -6,8 +6,8 @@
# struct { int x; } o;
# $ cl -Z7 t.c
-RUN: llvm-readobj -codeview %S/Inputs/codeview-merging-anon.obj | FileCheck %s
-RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-merging-anon.obj | FileCheck %s
+RUN: llvm-readobj --codeview %S/Inputs/codeview-merging-anon.obj | FileCheck %s
+RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-merging-anon.obj | FileCheck %s
CHECK-LABEL: FieldList (0x1000) {
CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)
diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test b/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test
index 4d612e8..b7c63c8 100644
--- a/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test
+++ b/llvm/test/tools/llvm-readobj/codeview-merging-cycle.test
@@ -1,4 +1,4 @@
-; RUN: not llvm-readobj -codeview-merged-types %S/Inputs/codeview-cycle.obj 2>&1 | FileCheck %s
+; RUN: not llvm-readobj --codeview-merged-types %S/Inputs/codeview-cycle.obj 2>&1 | FileCheck %s
; CHECK: error{{.*}} Input type graph contains cycles
diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test b/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test
index 04b30ff..7c57cf0 100644
--- a/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test
+++ b/llvm/test/tools/llvm-readobj/codeview-merging-ghash.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s -o=%t.obj
-# RUN: llvm-readobj -codeview-merged-types %t.obj | FileCheck %s --check-prefix=MERGED
-# RUN: llvm-readobj -codeview-merged-types -codeview-ghash %t.obj | FileCheck %s --check-prefix=MERGED
+# RUN: llvm-readobj --codeview-merged-types %t.obj | FileCheck %s --check-prefix=MERGED
+# RUN: llvm-readobj --codeview-merged-types --codeview-ghash %t.obj | FileCheck %s --check-prefix=MERGED
# MERGED: Format: COFF-x86-64
# MERGED-NEXT: Arch: x86_64
diff --git a/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test b/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test
index 6aaab3a..a52755a 100644
--- a/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test
+++ b/llvm/test/tools/llvm-readobj/codeview-merging-unsorted.test
@@ -1,5 +1,5 @@
-; RUN: llvm-readobj -codeview %S/Inputs/codeview-unsorted.obj | FileCheck %s
-; RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-unsorted.obj | FileCheck %s --check-prefix=MERGED
+; RUN: llvm-readobj --codeview %S/Inputs/codeview-unsorted.obj | FileCheck %s
+; RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-unsorted.obj | FileCheck %s --check-prefix=MERGED
; The input type stream has records that refer to later type indices in the same
; stream:
diff --git a/llvm/test/tools/llvm-readobj/codeview-merging.test b/llvm/test/tools/llvm-readobj/codeview-merging.test
index 4d453e5..af7b29f 100644
--- a/llvm/test/tools/llvm-readobj/codeview-merging.test
+++ b/llvm/test/tools/llvm-readobj/codeview-merging.test
@@ -17,9 +17,9 @@
# #endif
# $ cl -c -DCONFIG1 -Z7 t.cpp -Fot1.obj && cl -c -Z7 t.cpp -Fot2.obj
-RUN: llvm-readobj -codeview %S/Inputs/codeview-merging-1.obj | FileCheck %s --check-prefix=OBJ1
-RUN: llvm-readobj -codeview %S/Inputs/codeview-merging-2.obj | FileCheck %s --check-prefix=OBJ2
-RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-merging-1.obj %S/Inputs/codeview-merging-2.obj | FileCheck %s
+RUN: llvm-readobj --codeview %S/Inputs/codeview-merging-1.obj | FileCheck %s --check-prefix=OBJ1
+RUN: llvm-readobj --codeview %S/Inputs/codeview-merging-2.obj | FileCheck %s --check-prefix=OBJ2
+RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-merging-1.obj %S/Inputs/codeview-merging-2.obj | FileCheck %s
OBJ1: Procedure ({{.*}}) {
OBJ1-NEXT: TypeLeafKind: LF_PROCEDURE (0x1008)
diff --git a/llvm/test/tools/llvm-readobj/codeview-types.test b/llvm/test/tools/llvm-readobj/codeview-types.test
index 4545b8e..3c29396 100644
--- a/llvm/test/tools/llvm-readobj/codeview-types.test
+++ b/llvm/test/tools/llvm-readobj/codeview-types.test
@@ -5,8 +5,8 @@
// type records, we can regenerate the test using it instead.
// RUNX: cl -GR- -Z7 -c -TP %s -Fo%S/Inputs/codeview-types.obj
-// RUN: llvm-readobj -codeview %S/Inputs/codeview-types.obj | FileCheck %s
-// RUN: llvm-readobj -codeview-merged-types %S/Inputs/codeview-types.obj | FileCheck %s
+// RUN: llvm-readobj --codeview %S/Inputs/codeview-types.obj | FileCheck %s
+// RUN: llvm-readobj --codeview-merged-types %S/Inputs/codeview-types.obj | FileCheck %s
// TYPE_RECORD
// CHECK-DAG: {{^ *Pointer (.*) {$}}
diff --git a/llvm/test/tools/llvm-readobj/codeview-vftable.test b/llvm/test/tools/llvm-readobj/codeview-vftable.test
index 772f0c7..fb7acad 100644
--- a/llvm/test/tools/llvm-readobj/codeview-vftable.test
+++ b/llvm/test/tools/llvm-readobj/codeview-vftable.test
@@ -17,7 +17,7 @@
; B b;
; C c;
-RUN: llvm-readobj -codeview %p/Inputs/codeview-vftable.obj.coff | FileCheck %s
+RUN: llvm-readobj --codeview %p/Inputs/codeview-vftable.obj.coff | FileCheck %s
CHECK: VFTable (0x10F0) {
CHECK-NEXT: TypeLeafKind: LF_VFTABLE (0x151D)
diff --git a/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test b/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test
index c0febd7..5d6b538 100644
--- a/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test
+++ b/llvm/test/tools/llvm-readobj/coff-arm-baserelocs.test
@@ -1,4 +1,4 @@
-# RUN: llvm-readobj -coff-basereloc %p/Inputs/trivial.exe.coff-arm | FileCheck %s
+# RUN: llvm-readobj --coff-basereloc %p/Inputs/trivial.exe.coff-arm | FileCheck %s
# CHECK: Entry {
# CHECK: Type: ARM_MOV32(T)
diff --git a/llvm/test/tools/llvm-readobj/coff-basereloc.test b/llvm/test/tools/llvm-readobj/coff-basereloc.test
index cd6687c..3256a3a 100644
--- a/llvm/test/tools/llvm-readobj/coff-basereloc.test
+++ b/llvm/test/tools/llvm-readobj/coff-basereloc.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -coff-basereloc %p/Inputs/basereloc.obj.coff-i386 | FileCheck %s
+RUN: llvm-readobj --coff-basereloc %p/Inputs/basereloc.obj.coff-i386 | FileCheck %s
CHECK: Format: COFF-i386
CHECK-NEXT: Arch: i386
diff --git a/llvm/test/tools/llvm-readobj/coff-const-import.test b/llvm/test/tools/llvm-readobj/coff-const-import.test
index 3c3c482..432dee0 100644
--- a/llvm/test/tools/llvm-readobj/coff-const-import.test
+++ b/llvm/test/tools/llvm-readobj/coff-const-import.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -coff-exports %S/Inputs/const-import.lib | FileCheck %s
+RUN: llvm-readobj --coff-exports %S/Inputs/const-import.lib | FileCheck %s
CHECK: Type: const
CHECK: Name type: noprefix
diff --git a/llvm/test/tools/llvm-readobj/coff-debug-directory.test b/llvm/test/tools/llvm-readobj/coff-debug-directory.test
index f5c31c7..f67eb70 100644
--- a/llvm/test/tools/llvm-readobj/coff-debug-directory.test
+++ b/llvm/test/tools/llvm-readobj/coff-debug-directory.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -coff-debug-directory %p/Inputs/has_pdb.exe | FileCheck %s
+RUN: llvm-readobj --coff-debug-directory %p/Inputs/has_pdb.exe | FileCheck %s
CHECK: DebugDirectory [
CHECK: DebugEntry {
diff --git a/llvm/test/tools/llvm-readobj/coff-directives.test b/llvm/test/tools/llvm-readobj/coff-directives.test
index 83efffcf..a932583 100644
--- a/llvm/test/tools/llvm-readobj/coff-directives.test
+++ b/llvm/test/tools/llvm-readobj/coff-directives.test
@@ -1,2 +1,2 @@
-RUN: llvm-readobj -coff-directives %p/Inputs/directives.obj.coff-x86_64 | FileCheck %s
+RUN: llvm-readobj --coff-directives %p/Inputs/directives.obj.coff-x86_64 | FileCheck %s
CHECK: Directive(s): /DEFAULTLIB:"LIBCMT" /DEFAULTLIB:"OLDNAMES"
diff --git a/llvm/test/tools/llvm-readobj/coff-exports-implib.test b/llvm/test/tools/llvm-readobj/coff-exports-implib.test
index 2b32738..75d0809 100644
--- a/llvm/test/tools/llvm-readobj/coff-exports-implib.test
+++ b/llvm/test/tools/llvm-readobj/coff-exports-implib.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -coff-exports %p/Inputs/library.lib | FileCheck %s
+RUN: llvm-readobj --coff-exports %p/Inputs/library.lib | FileCheck %s
CHECK: File: library.dll
CHECK: Format: COFF-import-file
diff --git a/llvm/test/tools/llvm-readobj/coff-exports.test b/llvm/test/tools/llvm-readobj/coff-exports.test
index 54b42fe..c0c977d 100644
--- a/llvm/test/tools/llvm-readobj/coff-exports.test
+++ b/llvm/test/tools/llvm-readobj/coff-exports.test
@@ -1,6 +1,6 @@
-RUN: llvm-readobj -coff-exports %p/Inputs/export-x86.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X86
-RUN: llvm-readobj -coff-exports %p/Inputs/export-x64.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X64
-RUN: llvm-readobj -coff-exports %p/Inputs/export-arm.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-ARM
+RUN: llvm-readobj --coff-exports %p/Inputs/export-x86.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X86
+RUN: llvm-readobj --coff-exports %p/Inputs/export-x64.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-X64
+RUN: llvm-readobj --coff-exports %p/Inputs/export-arm.dll | FileCheck %s -check-prefix CHECK -check-prefix CHECK-ARM
CHECK: Export {
CHECK: Ordinal: 1
diff --git a/llvm/test/tools/llvm-readobj/coff-load-config.test b/llvm/test/tools/llvm-readobj/coff-load-config.test
index 45c83b1..b65c83b 100644
--- a/llvm/test/tools/llvm-readobj/coff-load-config.test
+++ b/llvm/test/tools/llvm-readobj/coff-load-config.test
@@ -1,9 +1,9 @@
-RUN: llvm-readobj -coff-load-config %S/Inputs/coff-load-config-x86.dll | FileCheck %s --check-prefix=X86
-RUN: llvm-readobj -coff-load-config %S/Inputs/coff-load-config-x64.dll | FileCheck %s --check-prefix=X64
+RUN: llvm-readobj --coff-load-config %S/Inputs/coff-load-config-x86.dll | FileCheck %s --check-prefix=X86
+RUN: llvm-readobj --coff-load-config %S/Inputs/coff-load-config-x64.dll | FileCheck %s --check-prefix=X64
-RUN: llvm-readobj -coff-load-config %S/Inputs/coff-load-config-data-end.exe | FileCheck %s --check-prefix=DATAEND
+RUN: llvm-readobj --coff-load-config %S/Inputs/coff-load-config-data-end.exe | FileCheck %s --check-prefix=DATAEND
-RUN: llvm-readobj -coff-load-config %S/Inputs/coff-no-load-config.exe | FileCheck %s --check-prefix=NOCONFIG
+RUN: llvm-readobj --coff-load-config %S/Inputs/coff-no-load-config.exe | FileCheck %s --check-prefix=NOCONFIG
X86: LoadConfig [
X86: Size: 0x5C
diff --git a/llvm/test/tools/llvm-readobj/coff-needed-libs.test b/llvm/test/tools/llvm-readobj/coff-needed-libs.test
index deb6bc2..7009f9c 100644
--- a/llvm/test/tools/llvm-readobj/coff-needed-libs.test
+++ b/llvm/test/tools/llvm-readobj/coff-needed-libs.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -needed-libs %p/Inputs/needed-libs.obj.coff-am64 | FileCheck %s
+RUN: llvm-readobj --needed-libs %p/Inputs/needed-libs.obj.coff-am64 | FileCheck %s
CHECK: NeededLibraries [
CHECK-NEXT: KERNEL32.dll
diff --git a/llvm/test/tools/llvm-readobj/coff-resources.test b/llvm/test/tools/llvm-readobj/coff-resources.test
index e426b6e..10cb438 100644
--- a/llvm/test/tools/llvm-readobj/coff-resources.test
+++ b/llvm/test/tools/llvm-readobj/coff-resources.test
@@ -4,9 +4,9 @@
// > rc /fo test_resource.res /nologo test_resource.rc
// > cvtres /machine:X86 /readonly /nologo /out:test_resource.o test_resource.res
-RUN: llvm-readobj -coff-resources -section-data %p/Inputs/zero-string-table.obj.coff-i386 \
+RUN: llvm-readobj --coff-resources --section-data %p/Inputs/zero-string-table.obj.coff-i386 \
RUN: | FileCheck %s -check-prefix ZERO
-RUN: llvm-readobj -coff-resources %p/Inputs/resources/test_resource.obj.coff \
+RUN: llvm-readobj --coff-resources %p/Inputs/resources/test_resource.obj.coff \
RUN: | FileCheck %s -check-prefix TEST_RES
ZERO: Resources [
diff --git a/llvm/test/tools/llvm-readobj/dyn-symbols.test b/llvm/test/tools/llvm-readobj/dyn-symbols.test
index 16a2aba..0a80e5c 100644
--- a/llvm/test/tools/llvm-readobj/dyn-symbols.test
+++ b/llvm/test/tools/llvm-readobj/dyn-symbols.test
@@ -1,8 +1,8 @@
RUN: llvm-readobj --dyn-symbols %p/Inputs/dynamic-table-so.x86 | FileCheck %s
-# Check the two-letter alias -dt is equivalent to the --dyn-symbols full flag
+# Check the two-letter alias --dt is equivalent to the --dyn-symbols full flag
# name.
-RUN: llvm-readobj -dt %p/Inputs/dynamic-table-so.x86 > %t.readobj-dt-alias
+RUN: llvm-readobj --dt %p/Inputs/dynamic-table-so.x86 > %t.readobj-dt-alias
RUN: llvm-readobj --dyn-symbols %p/Inputs/dynamic-table-so.x86 > %t.readobj-dt-no-alias
RUN: diff %t.readobj-dt-alias %t.readobj-dt-no-alias
diff --git a/llvm/test/tools/llvm-readobj/dynamic.test b/llvm/test/tools/llvm-readobj/dynamic.test
index 71b6b06..02ae622 100644
--- a/llvm/test/tools/llvm-readobj/dynamic.test
+++ b/llvm/test/tools/llvm-readobj/dynamic.test
@@ -1,5 +1,5 @@
// Check dynamic section tags in case of shared library file.
-RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-so.mips \
+RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.mips \
RUN: | FileCheck %s -check-prefix ELF-MIPS
ELF-MIPS: Format: ELF32-mips
@@ -34,7 +34,7 @@
ELF-MIPS: ]
// Check dynamic section tags in case of non-pic executable file.
-RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-exe.mips \
+RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-exe.mips \
RUN: | FileCheck %s -check-prefix ELF-MIPS-EXE
ELF-MIPS-EXE: Format: ELF32-mips
@@ -71,7 +71,7 @@
ELF-MIPS-EXE: 0x00000000 NULL 0x0
ELF-MIPS-EXE: ]
-RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-exe.x86 \
+RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-exe.x86 \
RUN: | FileCheck %s -check-prefix ELF-X86-EXE
ELF-X86-EXE: Format: ELF32-i386
@@ -112,7 +112,7 @@
ELF-X86-EXE: 0x00000000 NULL 0x0
ELF-X86-EXE: ]
-RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-so.x86 \
+RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.x86 \
RUN: | FileCheck %s -check-prefix ELF-X86-SO
ELF-X86-SO: Format: ELF64-x86-64
@@ -149,7 +149,7 @@
ELF-X86-SO: 0x000000006FFFFFF9 RELACOUNT 3
ELF-X86-SO: 0x0000000000000000 NULL 0x0
-RUN: llvm-readobj -dynamic-table %p/Inputs/dynamic-table-so.aarch64 \
+RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.aarch64 \
RUN: | FileCheck %s -check-prefix ELF-AARCH64-SO
ELF-AARCH64-SO: Format: ELF64-aarch64-little
diff --git a/llvm/test/tools/llvm-readobj/elf-dtflags.test b/llvm/test/tools/llvm-readobj/elf-dtflags.test
index 4e6c90d..b15ca77 100644
--- a/llvm/test/tools/llvm-readobj/elf-dtflags.test
+++ b/llvm/test/tools/llvm-readobj/elf-dtflags.test
@@ -4,7 +4,7 @@
// $ cat example.c
// int main(void) { return (0); }
-RUN: llvm-readobj -dynamic-table %p/Inputs/dtflags.elf-x86-64 | FileCheck %s
+RUN: llvm-readobj --dynamic-table %p/Inputs/dtflags.elf-x86-64 | FileCheck %s
CHECK: 0x000000000000001E FLAGS ORIGIN BIND_NOW
CHECK: 0x000000006FFFFFFB FLAGS_1 NOW ORIGIN
diff --git a/llvm/test/tools/llvm-readobj/elf-gnuhash.test b/llvm/test/tools/llvm-readobj/elf-gnuhash.test
index 8642a4d..c7d15dc 100644
--- a/llvm/test/tools/llvm-readobj/elf-gnuhash.test
+++ b/llvm/test/tools/llvm-readobj/elf-gnuhash.test
@@ -12,10 +12,10 @@
// .globl foo
// foo:
-RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-i386 | FileCheck %s -check-prefix I386
-RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-x86_64 | FileCheck %s -check-prefix X86_64
-RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc | FileCheck %s -check-prefix PPC
-RUN: llvm-readobj -gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc64 | FileCheck %s -check-prefix PPC64
+RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-i386 | FileCheck %s -check-prefix I386
+RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-x86_64 | FileCheck %s -check-prefix X86_64
+RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc | FileCheck %s -check-prefix PPC
+RUN: llvm-readobj --gnu-hash-table %p/Inputs/gnuhash.so.elf-ppc64 | FileCheck %s -check-prefix PPC64
I386: Arch: i386
I386: GnuHashTable {
diff --git a/llvm/test/tools/llvm-readobj/elf-groups.test b/llvm/test/tools/llvm-readobj/elf-groups.test
index f877d3f..9d13900 100644
--- a/llvm/test/tools/llvm-readobj/elf-groups.test
+++ b/llvm/test/tools/llvm-readobj/elf-groups.test
@@ -15,7 +15,7 @@
RUN: llvm-readobj -g %p/Inputs/elf-groups.x86_64 \
RUN: | FileCheck %s
-RUN: llvm-readobj -g -elf-output-style=GNU %p/Inputs/elf-groups.x86_64 \
+RUN: llvm-readobj -g --elf-output-style=GNU %p/Inputs/elf-groups.x86_64 \
RUN: | FileCheck --check-prefix="GNU" %s
CHECK: Groups {
CHECK-NEXT: Group {
diff --git a/llvm/test/tools/llvm-readobj/elf-hash-histogram.test b/llvm/test/tools/llvm-readobj/elf-hash-histogram.test
index b7ddfab..e500c4f 100644
--- a/llvm/test/tools/llvm-readobj/elf-hash-histogram.test
+++ b/llvm/test/tools/llvm-readobj/elf-hash-histogram.test
@@ -1,8 +1,8 @@
-RUN: llvm-readobj -elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \
+RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-ppc64 \
RUN: --elf-output-style=GNU | FileCheck %s -check-prefix PPC64GNU
-RUN: llvm-readobj -elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
+RUN: llvm-readobj --elf-hash-histogram %p/Inputs/gnuhash.so.elf-x86_64 --elf-output-style=GNU \
RUN: | FileCheck %s -check-prefix X86GNU
-RUN: llvm-readobj -elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel --elf-output-style=GNU \
+RUN: llvm-readobj --elf-hash-histogram %p/Inputs/got-plt.exe.elf-mipsel --elf-output-style=GNU \
RUN: | FileCheck %s -check-prefix SYSV
PPC64GNU: Histogram for `.gnu.hash' bucket list length (total of 3 buckets)
diff --git a/llvm/test/tools/llvm-readobj/elf-linker-options.ll b/llvm/test/tools/llvm-readobj/elf-linker-options.ll
index 8af33d8..31d08cf 100644
--- a/llvm/test/tools/llvm-readobj/elf-linker-options.ll
+++ b/llvm/test/tools/llvm-readobj/elf-linker-options.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple x86_64-elf -filetype obj -o - %s | llvm-readobj -elf-linker-options - | FileCheck %s
+; RUN: llc -mtriple x86_64-elf -filetype obj -o - %s | llvm-readobj --elf-linker-options - | FileCheck %s
; REQUIRES: x86-registered-target
!llvm.linker.options = !{!0, !1}
diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s
index b108d44..28b3547 100644
--- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s
+++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-empty.s
@@ -1,5 +1,5 @@
// REQUIRES: x86-registered-target
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -relocations - | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -r - | FileCheck %s
// CHECK: Relocations [
// CHECK-NEXT: Section (3) .rela.dyn {
diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s
index e418353..c837481 100644
--- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s
+++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error1.s
@@ -1,5 +1,5 @@
// REQUIRES: x86-registered-target
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s
// CHECK: error: invalid packed relocation header
diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s
index 28c325f..23dd33e 100644
--- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s
+++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error2.s
@@ -1,5 +1,5 @@
// REQUIRES: x86-registered-target
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s
// CHECK: error: malformed sleb128, extends past end
diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s
index e373a53..e2a6376 100644
--- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s
+++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error3.s
@@ -1,5 +1,5 @@
// REQUIRES: x86-registered-target
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s
// CHECK: error: malformed sleb128, extends past end
diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s
index 94ef6f4..97aee3a9 100644
--- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s
+++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error4.s
@@ -1,5 +1,5 @@
// REQUIRES: x86-registered-target
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s
// CHECK: error: malformed sleb128, extends past end
diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s
index b0c549f..1c2eb89 100644
--- a/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s
+++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs-error5.s
@@ -1,5 +1,5 @@
// REQUIRES: x86-registered-target
-// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -relocations - 2>&1 | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | not llvm-readobj -r - 2>&1 | FileCheck %s
// CHECK: error: relocation group unexpectedly large
diff --git a/llvm/test/tools/llvm-readobj/elf-packed-relocs.test b/llvm/test/tools/llvm-readobj/elf-packed-relocs.test
index 8fa73c3..4de725d 100644
--- a/llvm/test/tools/llvm-readobj/elf-packed-relocs.test
+++ b/llvm/test/tools/llvm-readobj/elf-packed-relocs.test
@@ -1,7 +1,7 @@
# The binary blobs in this file were created like this:
# llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu Inputs/elf-packed-relocs1.s -o - | obj2yaml | grep Content:
-# RUN: yaml2obj -docnum 1 %s | llvm-readobj -elf-output-style=LLVM -relocations - | FileCheck --check-prefix=LLVM1 %s
+# RUN: yaml2obj -docnum 1 %s | llvm-readobj --relocations - | FileCheck --check-prefix=LLVM1 %s
# LLVM1: Section (1) .rela.dyn {
# LLVM1-NEXT: 0x1100 R_X86_64_RELATIVE - 0x0
# LLVM1-NEXT: 0x1180 R_X86_64_RELATIVE - 0x0
@@ -13,7 +13,7 @@
# LLVM1-NEXT: 0x119F R_X86_64_64 sym2 0xA
# LLVM1-NEXT: }
-# RUN: yaml2obj -docnum 1 %s | llvm-readobj -elf-output-style=GNU -relocations - | FileCheck --check-prefix=GNU1 %s
+# RUN: yaml2obj -docnum 1 %s | llvm-readelf -relocations - | FileCheck --check-prefix=GNU1 %s
# GNU1: Relocation section '.rela.dyn' at offset 0x180 contains 8 entries:
# GNU1: 0000000000001100 0000000000000008 R_X86_64_RELATIVE 0
# GNU1-NEXT: 0000000000001180 0000000000000008 R_X86_64_RELATIVE 0
@@ -47,7 +47,7 @@
Binding: STB_GLOBAL
...
-# RUN: yaml2obj -docnum 2 %s | llvm-readobj -elf-output-style=LLVM -relocations - | FileCheck --check-prefix=LLVM2 %s
+# RUN: yaml2obj -docnum 2 %s | llvm-readobj --relocations - | FileCheck --check-prefix=LLVM2 %s
# LLVM2: Section (1) .rel.dyn {
# LLVM2-NEXT: 0x1008 R_386_32 sym1 0x0
# LLVM2-NEXT: 0x1010 R_386_GOT32 sym2 0x0
@@ -61,7 +61,7 @@
# LLVM2-NEXT: 0xFF0 R_386_RELATIVE - 0x0
# LLVM2-NEXT: }
-# RUN: yaml2obj -docnum 2 %s | llvm-readobj -elf-output-style=GNU -relocations - | FileCheck --check-prefix=GNU2 %s
+# RUN: yaml2obj -docnum 2 %s | llvm-readelf -relocations - | FileCheck --check-prefix=GNU2 %s
# GNU2: Relocation section '.rel.dyn' at offset 0xfc contains 10 entries:
# GNU2: 00001008 00000101 R_386_32 00000000 sym1
# GNU2-NEXT: 00001010 00000203 R_386_GOT32 00000000 sym2
@@ -97,7 +97,7 @@
Binding: STB_GLOBAL
...
-# RUN: yaml2obj -docnum 3 %s | llvm-readobj -elf-output-style=LLVM -relocations - | FileCheck --check-prefix=LLVM3 %s
+# RUN: yaml2obj -docnum 3 %s | llvm-readobj --relocations - | FileCheck --check-prefix=LLVM3 %s
#
# LLVM3: Section (1) .rela.dyn {
# LLVM3-NEXT: 0x1100 R_X86_64_RELATIVE - 0x0
@@ -108,7 +108,7 @@
# LLVM3-NEXT: 0x1218 R_X86_64_64 sym2 0x8
# LLVM3-NEXT: }
-# RUN: yaml2obj -docnum 3 %s | llvm-readobj -elf-output-style=GNU -relocations - | FileCheck --check-prefix=GNU3 %s
+# RUN: yaml2obj -docnum 3 %s | llvm-readelf -relocations - | FileCheck --check-prefix=GNU3 %s
# GNU3: Relocation section '.rela.dyn' at offset 0x180 contains 6 entries:
# GNU3: 0000000000001100 0000000000000008 R_X86_64_RELATIVE 0
# GNU3-NEXT: 0000000000001180 0000000000000008 R_X86_64_RELATIVE 8
diff --git a/llvm/test/tools/llvm-readobj/elf-relr-relocs.test b/llvm/test/tools/llvm-readobj/elf-relr-relocs.test
index 230faff..da1b6ab 100644
--- a/llvm/test/tools/llvm-readobj/elf-relr-relocs.test
+++ b/llvm/test/tools/llvm-readobj/elf-relr-relocs.test
@@ -2,7 +2,7 @@
# llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu Inputs/elf-relr-relocs1.s -o - | obj2yaml | grep Content:
# RUN: yaml2obj -docnum 1 %s \
-# RUN: | llvm-readobj -elf-output-style=LLVM -relocations -raw-relr - \
+# RUN: | llvm-readobj --relocations --raw-relr - \
# RUN: | FileCheck --check-prefix=RAW-LLVM1 %s
# RAW-LLVM1: Section (1) .relr.dyn {
# RAW-LLVM1-NEXT: 0x10D60
@@ -13,7 +13,7 @@
# RAW-LLVM1-NEXT: }
# RUN: yaml2obj -docnum 1 %s \
-# RUN: | llvm-readobj -elf-output-style=LLVM -relocations - \
+# RUN: | llvm-readobj --relocations - \
# RUN: | FileCheck --check-prefix=LLVM1 %s
# LLVM1: Section (1) .relr.dyn {
# LLVM1-NEXT: 0x10D60 R_X86_64_RELATIVE - 0x0
@@ -40,7 +40,7 @@
# LLVM1-NEXT: }
# RUN: yaml2obj -docnum 1 %s \
-# RUN: | llvm-readobj -elf-output-style=GNU -relocations -raw-relr - \
+# RUN: | llvm-readelf -relocations -raw-relr - \
# RUN: | FileCheck --check-prefix=RAW-GNU1 %s
# RAW-GNU1: Relocation section '.relr.dyn' at offset 0x180 contains 5 entries:
# RAW-GNU1: 0000000000010d60
@@ -50,7 +50,7 @@
# RAW-GNU1-NEXT: 000a700550400009
# RUN: yaml2obj -docnum 1 %s \
-# RUN: | llvm-readobj -elf-output-style=GNU -relocations - \
+# RUN: | llvm-readelf -relocations - \
# RUN: | FileCheck --check-prefix=GNU1 %s
# GNU1: Relocation section '.relr.dyn' at offset 0x180 contains 21 entries:
# GNU1: 0000000000010d60 0000000000000008 R_X86_64_RELATIVE
@@ -94,7 +94,7 @@
...
# RUN: yaml2obj -docnum 2 %s \
-# RUN: | llvm-readobj -elf-output-style=LLVM -relocations -raw-relr - \
+# RUN: | llvm-readobj --relocations --raw-relr - \
# RUN: | FileCheck --check-prefix=RAW-LLVM2 %s
# RAW-LLVM2: Section (1) .relr.dyn {
# RAW-LLVM2-NEXT: 0x10D60
@@ -105,7 +105,7 @@
# RAW-LLVM2-NEXT: }
# RUN: yaml2obj -docnum 2 %s \
-# RUN: | llvm-readobj -elf-output-style=LLVM -relocations - \
+# RUN: | llvm-readobj --relocations - \
# RUN: | FileCheck --check-prefix=LLVM2 %s
# LLVM2: Section (1) .relr.dyn {
# LLVM2-NEXT: 0x10D60 R_386_RELATIVE - 0x0
@@ -125,7 +125,7 @@
# LLVM2-NEXT: }
# RUN: yaml2obj -docnum 2 %s \
-# RUN: | llvm-readobj -elf-output-style=GNU -relocations -raw-relr - \
+# RUN: | llvm-readelf -relocations -raw-relr - \
# RUN: | FileCheck --check-prefix=RAW-GNU2 %s
# RAW-GNU2: Relocation section '.relr.dyn' at offset 0xfc contains 5 entries:
# RAW-GNU2: 00010d60
@@ -135,7 +135,7 @@
# RAW-GNU2-NEXT: 50400009
# RUN: yaml2obj -docnum 2 %s \
-# RUN: | llvm-readobj -elf-output-style=GNU -relocations - \
+# RUN: | llvm-readelf -relocations - \
# RUN: | FileCheck --check-prefix=GNU2 %s
# GNU2: Relocation section '.relr.dyn' at offset 0xfc contains 14 entries:
# GNU2: 00010d60 00000008 R_386_RELATIVE
diff --git a/llvm/test/tools/llvm-readobj/elf-sec-compressed.test b/llvm/test/tools/llvm-readobj/elf-sec-compressed.test
index baf0c68..5045c53 100644
--- a/llvm/test/tools/llvm-readobj/elf-sec-compressed.test
+++ b/llvm/test/tools/llvm-readobj/elf-sec-compressed.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -sections \
+RUN: llvm-readobj --sections \
RUN: %p/Inputs/compression.zlib.style.elf-x86-64 | FileCheck %s
CHECK: Section {
diff --git a/llvm/test/tools/llvm-readobj/elf-sec-flags.test b/llvm/test/tools/llvm-readobj/elf-sec-flags.test
index 8a97710..8507975 100644
--- a/llvm/test/tools/llvm-readobj/elf-sec-flags.test
+++ b/llvm/test/tools/llvm-readobj/elf-sec-flags.test
@@ -1,7 +1,7 @@
# Check that llvm-readobj shows arch specific ELF section flags.
# RUN: yaml2obj -docnum 1 %s > %t-hex.o
-# RUN: llvm-readobj -s %t-hex.o | FileCheck -check-prefix=HEX %s
+# RUN: llvm-readobj -S %t-hex.o | FileCheck -check-prefix=HEX %s
# HEX: Flags [ (0x10000000)
# HEX-NEXT: SHF_HEX_GPREL (0x10000000)
@@ -22,7 +22,7 @@
Size: 4
# RUN: yaml2obj -docnum 2 %s > %t-mips.o
-# RUN: llvm-readobj -s %t-mips.o | FileCheck -check-prefix=MIPS %s
+# RUN: llvm-readobj -S %t-mips.o | FileCheck -check-prefix=MIPS %s
# MIPS: Flags [ (0x38000000)
# MIPS-NEXT: SHF_MIPS_GPREL (0x10000000)
@@ -45,7 +45,7 @@
Size: 4
# RUN: yaml2obj -docnum 3 %s > %t-x86_64.o
-# RUN: llvm-readobj -s %t-x86_64.o | FileCheck -check-prefix=X86_64 %s
+# RUN: llvm-readobj -S %t-x86_64.o | FileCheck -check-prefix=X86_64 %s
# X86_64: Flags [ (0x10000000)
# X86_64-NEXT: SHF_X86_64_LARGE (0x10000000)
diff --git a/llvm/test/tools/llvm-readobj/gnu-note-size.test b/llvm/test/tools/llvm-readobj/gnu-note-size.test
index 4a160d1..ea01d5b 100644
--- a/llvm/test/tools/llvm-readobj/gnu-note-size.test
+++ b/llvm/test/tools/llvm-readobj/gnu-note-size.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s > %t
-# RUN: llvm-readobj -elf-output-style GNU --notes %t | FileCheck %s --check-prefix=GNU
-# RUN: llvm-readobj -elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
+# RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU
+# RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
# GNU: Owner Data size Description
# GNU-NEXT: GNU 0x00000004 NT_GNU_ABI_TAG (ABI version tag)
diff --git a/llvm/test/tools/llvm-readobj/gnu-notes.test b/llvm/test/tools/llvm-readobj/gnu-notes.test
index ab7dcde..7f4b4f6 100644
--- a/llvm/test/tools/llvm-readobj/gnu-notes.test
+++ b/llvm/test/tools/llvm-readobj/gnu-notes.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s > %t.so
-# RUN: llvm-readobj -elf-output-style GNU --notes %t.so | FileCheck %s --check-prefix=GNU
-# RUN: llvm-readobj -elf-output-style LLVM --notes %t.so | FileCheck %s --check-prefix=LLVM
+# RUN: llvm-readelf --notes %t.so | FileCheck %s --check-prefix=GNU
+# RUN: llvm-readobj --elf-output-style LLVM --notes %t.so | FileCheck %s --check-prefix=LLVM
# GNU: Displaying notes found at file offset 0x00000340 with length 0x00000020:
# GNU-NEXT: Owner Data size Description
diff --git a/llvm/test/tools/llvm-readobj/gnu-phdrs.test b/llvm/test/tools/llvm-readobj/gnu-phdrs.test
index f6840e5..6db6d546 100644
--- a/llvm/test/tools/llvm-readobj/gnu-phdrs.test
+++ b/llvm/test/tools/llvm-readobj/gnu-phdrs.test
@@ -10,9 +10,9 @@
# compiled as clang++ source.cpp
# and clang++ -m32 source.cpp
-RUN: llvm-readobj -program-headers %p/Inputs/phdrs-elf.exe-i386 --elf-output-style=GNU \
+RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-i386 --elf-output-style=GNU \
RUN: | FileCheck %s -check-prefix ELF32
-RUN: llvm-readobj -program-headers %p/Inputs/phdrs-elf.exe-x86_64 --elf-output-style=GNU \
+RUN: llvm-readobj -l %p/Inputs/phdrs-elf.exe-x86_64 --elf-output-style=GNU \
RUN: | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING
RUN: llvm-readelf -program-headers %p/Inputs/phdrs-elf.exe-x86_64 \
RUN: | FileCheck %s -check-prefixes ELF64-PHDRS,ELF64-MAPPING
diff --git a/llvm/test/tools/llvm-readobj/gnu-sections.test b/llvm/test/tools/llvm-readobj/gnu-sections.test
index f5b504f..a61f767 100644
--- a/llvm/test/tools/llvm-readobj/gnu-sections.test
+++ b/llvm/test/tools/llvm-readobj/gnu-sections.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -s %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \
+RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-i386 --elf-output-style=GNU \
RUN: | FileCheck %s -check-prefix ELF32
RUN: llvm-readobj -S %p/Inputs/relocs.obj.elf-x86_64 --elf-output-style=GNU \
RUN: | FileCheck %s -check-prefix ELF64
diff --git a/llvm/test/tools/llvm-readobj/macho-needed-libs.test b/llvm/test/tools/llvm-readobj/macho-needed-libs.test
index 22e6948..d199327 100644
--- a/llvm/test/tools/llvm-readobj/macho-needed-libs.test
+++ b/llvm/test/tools/llvm-readobj/macho-needed-libs.test
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s -o %t.o
-# RUN: llvm-readobj -needed-libs %t.o | FileCheck %s
+# RUN: llvm-readobj --needed-libs %t.o | FileCheck %s
# CHECK: NeededLibraries [
# CHECK-NEXT: /usr/lib/libSystem.B.dylib
diff --git a/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test b/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test
index 2138bb7..b13bd45 100644
--- a/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test
+++ b/llvm/test/tools/llvm-readobj/macho-universal-x86_64.i386.test
@@ -1,13 +1,13 @@
RUN: llvm-readobj -h %p/Inputs/macho-universal.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTIHEADER
-RUN: llvm-readobj -sections %p/Inputs/macho-universal.x86_64.i386 \
+RUN: llvm-readobj --sections %p/Inputs/macho-universal.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTISECTIONS
RUN: llvm-readobj -h %p/Inputs/macho-universal-archive.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTIHEADER-ARCHIVE
-RUN: llvm-readobj -sections %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN: llvm-readobj --sections %p/Inputs/macho-universal-archive.x86_64.i386 \
RUN: | FileCheck %s -check-prefix MULTISECTIONS-ARCHIVE
MULTIHEADER: Format: Mach-O 64-bit x86-64
diff --git a/llvm/test/tools/llvm-readobj/many-sections.s b/llvm/test/tools/llvm-readobj/many-sections.s
index 053dbbf..bf3e7b2 100644
--- a/llvm/test/tools/llvm-readobj/many-sections.s
+++ b/llvm/test/tools/llvm-readobj/many-sections.s
@@ -11,13 +11,13 @@
## space, but its e_shnum, e_shstrndx, sh_size and sh_link fields are set
## according to the above description, so that we can test the dumper.
-# RUN: llvm-readobj -file-headers -sections -elf-output-style GNU \
+# RUN: llvm-readobj --file-headers -S --elf-output-style GNU \
# RUN: %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=GNU1
# GNU1: Number of section headers: 0 (5)
# GNU1: Section header string table index: 65535 (3)
# GNU1: There are 5 section headers, starting at offset 0xb8
-# RUN: llvm-readobj -file-headers -elf-output-style LLVM \
+# RUN: llvm-readobj --file-headers --elf-output-style LLVM \
# RUN: %p/Inputs/many-sections.elf-x86_64 | FileCheck %s --check-prefix=LLVM1
# LLVM1: SectionHeaderCount: 0 (5)
# LLVM1: StringTableSectionIndex: 65535 (3)
@@ -26,12 +26,12 @@
## e_shoff field set to zero, but not e_shstrndx, to show that
## this corrupt case is handled correctly.
-# RUN: llvm-readobj -file-headers -elf-output-style GNU \
+# RUN: llvm-readobj --file-headers --elf-output-style GNU \
# RUN: %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=GNU2
# GNU2: Number of section headers: 0
# GNU2: Section header string table index: 65535 (corrupt: out of range)
-# RUN: llvm-readobj -file-headers -elf-output-style LLVM \
+# RUN: llvm-readobj --file-headers --elf-output-style LLVM \
# RUN: %p/Inputs/many-sections-stripped.elf-x86_64 | FileCheck %s --check-prefix=LLVM2
# LLVM2: SectionHeaderCount: 0
# LLVM2: StringTableSectionIndex: 65535 (corrupt: out of range)
diff --git a/llvm/test/tools/llvm-readobj/mips-abiflags.test b/llvm/test/tools/llvm-readobj/mips-abiflags.test
index b4c769b..c06d147 100644
--- a/llvm/test/tools/llvm-readobj/mips-abiflags.test
+++ b/llvm/test/tools/llvm-readobj/mips-abiflags.test
@@ -1,6 +1,6 @@
-RUN: llvm-readobj -mips-abi-flags %p/Inputs/abiflags.obj.elf-mipsel | \
+RUN: llvm-readobj --mips-abi-flags %p/Inputs/abiflags.obj.elf-mipsel | \
RUN: FileCheck -check-prefix=EL64 %s
-RUN: llvm-readobj -mips-abi-flags %p/Inputs/abiflags.obj.elf-mips | \
+RUN: llvm-readobj --mips-abi-flags %p/Inputs/abiflags.obj.elf-mips | \
RUN: FileCheck -check-prefix=BE32 %s
EL64: MIPS ABI Flags {
diff --git a/llvm/test/tools/llvm-readobj/mips-got-overlapped.test b/llvm/test/tools/llvm-readobj/mips-got-overlapped.test
index ae4ae95..85c4fe2 100644
--- a/llvm/test/tools/llvm-readobj/mips-got-overlapped.test
+++ b/llvm/test/tools/llvm-readobj/mips-got-overlapped.test
@@ -1,9 +1,9 @@
-# Check that llvm-readobj -mips-plt-got correctly shows .got section
+# Check that llvm-readobj --mips-plt-got correctly shows .got section
# content if there are some other zero-sized sections with the same
# address as the .got. got-over.exe.elf-mips has zero-sized .data
# section at the same offset .got section.
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-over.exe.elf-mips | FileCheck %s
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-over.exe.elf-mips | FileCheck %s
GOT-OBJ: Cannot find PLTGOT dynamic table tag.
diff --git a/llvm/test/tools/llvm-readobj/mips-got.test b/llvm/test/tools/llvm-readobj/mips-got.test
index ca7edc2..c931142 100644
--- a/llvm/test/tools/llvm-readobj/mips-got.test
+++ b/llvm/test/tools/llvm-readobj/mips-got.test
@@ -1,32 +1,32 @@
-RUN: not llvm-readobj -mips-plt-got %p/Inputs/relocs.obj.elf-mips 2>&1 | \
+RUN: not llvm-readobj --mips-plt-got %p/Inputs/relocs.obj.elf-mips 2>&1 | \
RUN: FileCheck %s -check-prefix GOT-OBJ
-RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-exe.mips | \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-exe.mips | \
RUN: FileCheck %s -check-prefix GOT-EXE
-RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-so.mips | \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-so.mips | \
RUN: FileCheck %s -check-prefix GOT-SO
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-tls.so.elf-mips64el | \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el | \
RUN: FileCheck %s -check-prefix GOT-TLS
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-empty.exe.mipsel | \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-empty.exe.mipsel | \
RUN: FileCheck %s -check-prefix GOT-EMPTY
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-static.exe.mips | \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips | \
RUN: FileCheck %s -check-prefix GOT-STATIC
-RUN: not llvm-readobj -mips-plt-got %p/Inputs/relocs.obj.elf-mips \
+RUN: not llvm-readobj --mips-plt-got %p/Inputs/relocs.obj.elf-mips \
RUN: --elf-output-style=GNU 2>&1 | \
RUN: FileCheck %s -check-prefix GNU-GOT-OBJ
-RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-exe.mips \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-exe.mips \
RUN: --elf-output-style=GNU | \
RUN: FileCheck %s -check-prefix GNU-GOT-EXE
-RUN: llvm-readobj -mips-plt-got %p/Inputs/dynamic-table-so.mips \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/dynamic-table-so.mips \
RUN: --elf-output-style=GNU | \
RUN: FileCheck %s -check-prefix GNU-GOT-SO
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-tls.so.elf-mips64el \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-tls.so.elf-mips64el \
RUN: --elf-output-style=GNU | \
RUN: FileCheck %s -check-prefix GNU-GOT-TLS
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-empty.exe.mipsel \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-empty.exe.mipsel \
RUN: --elf-output-style=GNU | \
RUN: FileCheck %s -check-prefix GNU-GOT-EMPTY
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-static.exe.mips \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-static.exe.mips \
RUN: --elf-output-style=GNU | \
RUN: FileCheck %s -check-prefix GNU-GOT-STATIC
diff --git a/llvm/test/tools/llvm-readobj/mips-options-sec.test b/llvm/test/tools/llvm-readobj/mips-options-sec.test
index 0fe8aad..64b3f0e 100644
--- a/llvm/test/tools/llvm-readobj/mips-options-sec.test
+++ b/llvm/test/tools/llvm-readobj/mips-options-sec.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -mips-options %p/Inputs/options.obj.elf-mipsel | FileCheck %s
+RUN: llvm-readobj --mips-options %p/Inputs/options.obj.elf-mipsel | FileCheck %s
CHECK: MIPS Options {
CHECK-NEXT: ODK_REGINFO {
diff --git a/llvm/test/tools/llvm-readobj/mips-options.test b/llvm/test/tools/llvm-readobj/mips-options.test
index 7a2959d..d44b3c0 100644
--- a/llvm/test/tools/llvm-readobj/mips-options.test
+++ b/llvm/test/tools/llvm-readobj/mips-options.test
@@ -1,6 +1,6 @@
# Check DT_MIPS_OPTIONS .dynamic section tag reading
-RUN: llvm-readobj -dynamic-table %p/Inputs/mips-options.elf-mips64el | \
+RUN: llvm-readobj --dynamic-table %p/Inputs/mips-options.elf-mips64el | \
RUN: FileCheck %s
CHECK: DynamicSection [ (14 entries)
diff --git a/llvm/test/tools/llvm-readobj/mips-plt.test b/llvm/test/tools/llvm-readobj/mips-plt.test
index f41940c..21670b0 100644
--- a/llvm/test/tools/llvm-readobj/mips-plt.test
+++ b/llvm/test/tools/llvm-readobj/mips-plt.test
@@ -1,5 +1,5 @@
-RUN: llvm-readobj -mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel | FileCheck %s
-RUN: llvm-readobj -mips-plt-got --elf-output-style=GNU \
+RUN: llvm-readobj --mips-plt-got %p/Inputs/got-plt.exe.elf-mipsel | FileCheck %s
+RUN: llvm-readobj --mips-plt-got --elf-output-style=GNU \
RUN: %p/Inputs/got-plt.exe.elf-mipsel \
RUN: | FileCheck --check-prefix=GNU %s
diff --git a/llvm/test/tools/llvm-readobj/mips-reginfo.test b/llvm/test/tools/llvm-readobj/mips-reginfo.test
index d983d0a..7571d4c 100644
--- a/llvm/test/tools/llvm-readobj/mips-reginfo.test
+++ b/llvm/test/tools/llvm-readobj/mips-reginfo.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -mips-reginfo %p/Inputs/reginfo.obj.elf-mipsel | FileCheck %s
+RUN: llvm-readobj --mips-reginfo %p/Inputs/reginfo.obj.elf-mipsel | FileCheck %s
CHECK: MIPS RegInfo {
CHECK-NEXT: GP: 0x7FEF
diff --git a/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test b/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test
index adde787..05e5411 100644
--- a/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test
+++ b/llvm/test/tools/llvm-readobj/mips-rld-map-rel.test
@@ -1,6 +1,6 @@
# Check DT_MIPS_RLD_MAP_REL .dynamic section tag reading
-RUN: llvm-readobj -dynamic-table %p/Inputs/mips-rld-map-rel.elf-mipsel | \
+RUN: llvm-readobj --dynamic-table %p/Inputs/mips-rld-map-rel.elf-mipsel | \
RUN: FileCheck %s
CHECK: DynamicSection [ (16 entries)
diff --git a/llvm/test/tools/llvm-readobj/mips-st-other.test b/llvm/test/tools/llvm-readobj/mips-st-other.test
index 1f9de58..c164004 100644
--- a/llvm/test/tools/llvm-readobj/mips-st-other.test
+++ b/llvm/test/tools/llvm-readobj/mips-st-other.test
@@ -1,6 +1,6 @@
-RUN: llvm-readobj -symbols %p/Inputs/st-other.obj.elf-mips \
+RUN: llvm-readobj --symbols %p/Inputs/st-other.obj.elf-mips \
RUN: | FileCheck -check-prefix=MREG %s
-RUN: llvm-readobj -symbols %p/Inputs/st-other.obj.elf-mips16 \
+RUN: llvm-readobj --symbols %p/Inputs/st-other.obj.elf-mips16 \
RUN: | FileCheck -check-prefix=M16 %s
MREG: Name: foo
diff --git a/llvm/test/tools/llvm-readobj/note-gnu-property.s b/llvm/test/tools/llvm-readobj/note-gnu-property.s
index 598c754..931dce6 100644
--- a/llvm/test/tools/llvm-readobj/note-gnu-property.s
+++ b/llvm/test/tools/llvm-readobj/note-gnu-property.s
@@ -1,7 +1,7 @@
// REQUIRES: x86-registered-target
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
-// RUN: llvm-readobj -elf-output-style GNU --notes %t | FileCheck %s --check-prefix=GNU
-// RUN: llvm-readobj -elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
+// RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU
+// RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
// GNU: Displaying notes found at file offset 0x00000040 with length 0x000000f8:
// GNU-NEXT: Owner Data size Description
diff --git a/llvm/test/tools/llvm-readobj/note-gnu-property2.s b/llvm/test/tools/llvm-readobj/note-gnu-property2.s
index 473e0a2..899f6cd 100644
--- a/llvm/test/tools/llvm-readobj/note-gnu-property2.s
+++ b/llvm/test/tools/llvm-readobj/note-gnu-property2.s
@@ -1,7 +1,7 @@
// REQUIRES: x86-registered-target
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
-// RUN: llvm-readobj -elf-output-style GNU --notes %t | FileCheck %s --check-prefix=GNU
-// RUN: llvm-readobj -elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
+// RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU
+// RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
// GNU: Displaying notes found at file offset 0x00000040 with length 0x00000014:
// GNU-NEXT: Owner Data size Description
diff --git a/llvm/test/tools/llvm-readobj/peplus.test b/llvm/test/tools/llvm-readobj/peplus.test
index 3619cd7..ff21d91 100644
--- a/llvm/test/tools/llvm-readobj/peplus.test
+++ b/llvm/test/tools/llvm-readobj/peplus.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -file-headers %p/Inputs/nop.exe.coff-x86-64 | FileCheck %s
+RUN: llvm-readobj --file-headers %p/Inputs/nop.exe.coff-x86-64 | FileCheck %s
CHECK: Format: COFF-x86-64
CHECK: Arch: x86_64
diff --git a/llvm/test/tools/llvm-readobj/ppc64-glink.test b/llvm/test/tools/llvm-readobj/ppc64-glink.test
index 9602a5a..ac36178 100644
--- a/llvm/test/tools/llvm-readobj/ppc64-glink.test
+++ b/llvm/test/tools/llvm-readobj/ppc64-glink.test
@@ -1,6 +1,6 @@
# Check DT_PPC64_GLINK dynamic tag.
-RUN: llvm-readobj -dynamic-table %p/Inputs/ppc64.exe | FileCheck %s
+RUN: llvm-readobj --dynamic-table %p/Inputs/ppc64.exe | FileCheck %s
CHECK: Format: ELF64-ppc64
CHECK: Arch: powerpc64le
diff --git a/llvm/test/tools/llvm-readobj/program-headers.test b/llvm/test/tools/llvm-readobj/program-headers.test
index e507442..960248e 100644
--- a/llvm/test/tools/llvm-readobj/program-headers.test
+++ b/llvm/test/tools/llvm-readobj/program-headers.test
@@ -1,10 +1,12 @@
-RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.elf-i386 \
+RUN: llvm-readobj --program-headers %p/../../Object/Inputs/program-headers.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF-I386
-RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.elf-x86-64 \
+RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.elf-i386 \
+RUN: | FileCheck %s -check-prefix ELF-I386
+RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.elf-x86-64 \
RUN: | FileCheck %s -check-prefix ELF-X86-64
-RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.mips \
+RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.mips \
RUN: | FileCheck %s -check-prefix ELF-MIPS
-RUN: llvm-readobj -program-headers %p/../../Object/Inputs/program-headers.mips64 \
+RUN: llvm-readobj -l %p/../../Object/Inputs/program-headers.mips64 \
RUN: | FileCheck %s -check-prefix ELF-MIPS64
## openbsd-phdrs.elf-x86-64 was generated using GNU ld (GNU Binutils for Ubuntu) 2.26.1.
@@ -18,7 +20,7 @@
## 0x65a3dbe7 is the value of PT_OPENBSD_WXNEEDED,
## 0x65a41be6 is the value of PT_OPENBSD_BOOTDATA
## SECTIONS { . = SIZEOF_HEADERS; .all : { *(.*) } : text }
-RUN: llvm-readobj -program-headers %p/../../Object/Inputs/openbsd-phdrs.elf-x86-64 \
+RUN: llvm-readobj -l %p/../../Object/Inputs/openbsd-phdrs.elf-x86-64 \
RUN: | FileCheck %s -check-prefix OPENBSD-X86-64
ELF-I386: ProgramHeaders [
diff --git a/llvm/test/tools/llvm-readobj/readelf-s-alias.test b/llvm/test/tools/llvm-readobj/readelf-s-alias.test
index e34f81e..b50d0e2 100644
--- a/llvm/test/tools/llvm-readobj/readelf-s-alias.test
+++ b/llvm/test/tools/llvm-readobj/readelf-s-alias.test
@@ -1,5 +1,5 @@
# In llvm-readobj, -s is an alias for --sections.
-RUN: llvm-readobj -s %p/Inputs/trivial.obj.elf-i386 \
+RUN: llvm-readobj -S %p/Inputs/trivial.obj.elf-i386 \
RUN: | FileCheck %s -check-prefix SEC
RUN: llvm-readobj --sections %p/Inputs/trivial.obj.elf-i386 \
RUN: | FileCheck %s -check-prefix SEC
diff --git a/llvm/test/tools/llvm-readobj/reloc-types.test b/llvm/test/tools/llvm-readobj/reloc-types.test
index abdd0e3..1d5210f 100644
--- a/llvm/test/tools/llvm-readobj/reloc-types.test
+++ b/llvm/test/tools/llvm-readobj/reloc-types.test
@@ -3,19 +3,19 @@
// Todo: ELF-PPC, ELF-HEXAGON
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-i386 | FileCheck %s -check-prefix ELF-32
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-x86_64 | FileCheck %s -check-prefix ELF-64
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-aarch64 | FileCheck %s -check-prefix ELF-AARCH64
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-arm | FileCheck %s -check-prefix ELF-ARM
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-lanai | FileCheck %s -check-prefix ELF-LANAI
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-mips | FileCheck %s -check-prefix ELF-MIPS
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-mips64el | FileCheck %s -check-prefix ELF-MIPS64EL
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.elf-ppc64 | FileCheck %s -check-prefix ELF-PPC64
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.coff-i386 | FileCheck %s -check-prefix COFF-32
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.coff-x86_64 | FileCheck %s -check-prefix COFF-64
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.macho-arm | FileCheck %s -check-prefix MACHO-ARM
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.macho-i386 | FileCheck %s -check-prefix MACHO-32
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/relocs.obj.macho-x86_64 | FileCheck %s -check-prefix MACHO-64
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-i386 | FileCheck %s -check-prefix ELF-32
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-x86_64 | FileCheck %s -check-prefix ELF-64
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-aarch64 | FileCheck %s -check-prefix ELF-AARCH64
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-arm | FileCheck %s -check-prefix ELF-ARM
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-lanai | FileCheck %s -check-prefix ELF-LANAI
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-mips | FileCheck %s -check-prefix ELF-MIPS
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-mips64el | FileCheck %s -check-prefix ELF-MIPS64EL
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.elf-ppc64 | FileCheck %s -check-prefix ELF-PPC64
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.coff-i386 | FileCheck %s -check-prefix COFF-32
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.coff-x86_64 | FileCheck %s -check-prefix COFF-64
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.macho-arm | FileCheck %s -check-prefix MACHO-ARM
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.macho-i386 | FileCheck %s -check-prefix MACHO-32
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/relocs.obj.macho-x86_64 | FileCheck %s -check-prefix MACHO-64
ELF-32: Type: R_386_NONE (0)
diff --git a/llvm/test/tools/llvm-readobj/relocations.test b/llvm/test/tools/llvm-readobj/relocations.test
index 9ca79e3..a459981 100644
--- a/llvm/test/tools/llvm-readobj/relocations.test
+++ b/llvm/test/tools/llvm-readobj/relocations.test
@@ -14,7 +14,7 @@
RUN: | FileCheck %s -check-prefix MACHO-PPC
RUN: llvm-readobj -r --expand-relocs %p/Inputs/trivial.obj.macho-ppc64 \
RUN: | FileCheck %s -check-prefix MACHO-PPC64
-RUN: llvm-readobj -r -expand-relocs %p/Inputs/trivial.obj.macho-arm \
+RUN: llvm-readobj -r --expand-relocs %p/Inputs/trivial.obj.macho-arm \
RUN: | FileCheck %s -check-prefix MACHO-ARM
RUN: llvm-readobj -r --expand-relocs %p/Inputs/trivial.obj.wasm \
RUN: | FileCheck %s -check-prefix WASM
diff --git a/llvm/test/tools/llvm-readobj/rpath.test b/llvm/test/tools/llvm-readobj/rpath.test
index 600938e..c615ada 100644
--- a/llvm/test/tools/llvm-readobj/rpath.test
+++ b/llvm/test/tools/llvm-readobj/rpath.test
@@ -1,4 +1,4 @@
-RUN: llvm-readobj -dynamic-table %p/Inputs/rpath.exe.elf-x86_64 \
+RUN: llvm-readobj --dynamic-table %p/Inputs/rpath.exe.elf-x86_64 \
RUN: | FileCheck %s
CHECK: 0x000000000000000F RPATH /usr/local/lib
diff --git a/llvm/test/tools/llvm-readobj/sections-ext.test b/llvm/test/tools/llvm-readobj/sections-ext.test
index e9849a6..2691c22 100644
--- a/llvm/test/tools/llvm-readobj/sections-ext.test
+++ b/llvm/test/tools/llvm-readobj/sections-ext.test
@@ -1,30 +1,30 @@
-RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.coff-i386 \
+RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.coff-i386 \
RUN: | FileCheck %s -check-prefix COFF
-RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.elf-i386 \
+RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.elf-i386 \
RUN: | FileCheck %s -check-prefix ELF
-RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.macho-i386 \
+RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.macho-i386 \
RUN: | FileCheck %s -check-prefix MACHO-I386
-RUN: llvm-readobj -s -st -sr -sd %p/Inputs/trivial.obj.macho-x86-64 \
+RUN: llvm-readobj -S --st --sr --sd %p/Inputs/trivial.obj.macho-x86-64 \
RUN: | FileCheck %s -check-prefix MACHO-X86-64
-RUN: llvm-readobj --expand-relocs -s -st -sr -sd %p/Inputs/trivial.obj.macho-ppc \
+RUN: llvm-readobj --expand-relocs -S --st --sr --sd %p/Inputs/trivial.obj.macho-ppc \
RUN: | FileCheck %s -check-prefix MACHO-PPC
-RUN: llvm-readobj --expand-relocs -s -st -sr -sd %p/Inputs/trivial.obj.macho-ppc64 \
+RUN: llvm-readobj --expand-relocs -S --st --sr --sd %p/Inputs/trivial.obj.macho-ppc64 \
RUN: | FileCheck %s -check-prefix MACHO-PPC64
-RUN: llvm-readobj -expand-relocs -s -st -sr -sd %p/Inputs/trivial.obj.macho-arm \
+RUN: llvm-readobj --expand-relocs -S --st --sr --sd %p/Inputs/trivial.obj.macho-arm \
RUN: | FileCheck %s -check-prefix MACHO-ARM
# Check the two-letter aliases above (-st, -sr, -sd) are equivalent to their
# full flag names.
-RUN: llvm-readobj -s -st %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-alias
-RUN: llvm-readobj -s --section-symbols %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-no-alias
+RUN: llvm-readobj -S --st %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-alias
+RUN: llvm-readobj -S --section-symbols %p/Inputs/trivial.obj.elf-i386 > %t.readobj-st-no-alias
RUN: diff %t.readobj-st-alias %t.readobj-st-no-alias
-RUN: llvm-readobj -s -sr %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-alias
-RUN: llvm-readobj -s --section-relocations %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-no-alias
+RUN: llvm-readobj -S --sr %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-alias
+RUN: llvm-readobj -S --section-relocations %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sr-no-alias
RUN: diff %t.readobj-sr-alias %t.readobj-sr-no-alias
-RUN: llvm-readobj -s -sd %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-alias
-RUN: llvm-readobj -s --section-data %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-no-alias
+RUN: llvm-readobj -S --sd %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-alias
+RUN: llvm-readobj -S --section-data %p/Inputs/trivial.obj.elf-i386 > %t.readobj-sd-no-alias
RUN: diff %t.readobj-sd-alias %t.readobj-sd-no-alias
COFF: Sections [
diff --git a/llvm/test/tools/llvm-readobj/sections.test b/llvm/test/tools/llvm-readobj/sections.test
index a66e663..5eab22b 100644
--- a/llvm/test/tools/llvm-readobj/sections.test
+++ b/llvm/test/tools/llvm-readobj/sections.test
@@ -21,7 +21,7 @@
RUN: llvm-readobj --sections %p/Inputs/trivial.obj.elf-i386 > %t.sections
RUN: llvm-readobj -S %p/Inputs/trivial.obj.elf-i386 > %t.uppers
RUN: cmp %t.sections %t.uppers
-RUN: llvm-readobj -s %p/Inputs/trivial.obj.elf-i386 > %t.lowers
+RUN: llvm-readobj -S %p/Inputs/trivial.obj.elf-i386 > %t.lowers
RUN: cmp %t.sections %t.lowers
COFF: Sections [
diff --git a/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test b/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test
index 879afe2..17d0516 100644
--- a/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test
+++ b/llvm/test/tools/llvm-readobj/unwind-arm64-windows.test
@@ -1,5 +1,5 @@
-RUN: llvm-readobj -unwind %p/Inputs/arm64-win1.obj | FileCheck %s -check-prefix=UNWIND1
-RUN: llvm-readobj -unwind %p/Inputs/arm64-win2.obj | FileCheck %s -check-prefix=UNWIND2
+RUN: llvm-readobj --unwind %p/Inputs/arm64-win1.obj | FileCheck %s -check-prefix=UNWIND1
+RUN: llvm-readobj --unwind %p/Inputs/arm64-win2.obj | FileCheck %s -check-prefix=UNWIND2
UNWIND1: ExceptionData {
UNWIND1-NEXT: FunctionLength: 340
diff --git a/llvm/test/tools/llvm-readobj/unwind.test b/llvm/test/tools/llvm-readobj/unwind.test
index 72c5910..8c6b13f 100644
--- a/llvm/test/tools/llvm-readobj/unwind.test
+++ b/llvm/test/tools/llvm-readobj/unwind.test
@@ -1,5 +1,5 @@
RUN: yaml2obj %p/Inputs/dwarf-exprs.exe-x86-64.yaml > %t.exe
-RUN: llvm-readobj -unwind %t.exe | FileCheck %s
+RUN: llvm-readobj --unwind %t.exe | FileCheck %s
CHECK: EH_FRAME Header [
CHECK-NEXT: Address: 0x4013c0