[llvm] 6ed18ea - [llvm-objdump][test] Change llvm-objdump tests to use double dash options
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Mar 15 16:01:51 PDT 2020
Author: Fangrui Song
Date: 2020-03-15T16:01:26-07:00
New Revision: 6ed18eaa777beac510272c73e3889d9ec54ad341
URL: https://github.com/llvm/llvm-project/commit/6ed18eaa777beac510272c73e3889d9ec54ad341
DIFF: https://github.com/llvm/llvm-project/commit/6ed18eaa777beac510272c73e3889d9ec54ad341.diff
LOG: [llvm-objdump][test] Change llvm-objdump tests to use double dash options
Added:
Modified:
llvm/test/tools/llvm-objdump/COFF/eh_frame.test
llvm/test/tools/llvm-objdump/COFF/file-headers.test
llvm/test/tools/llvm-objdump/ELF/AArch64/plt.test
llvm/test/tools/llvm-objdump/ELF/AMDGPU/source-lines.ll
llvm/test/tools/llvm-objdump/ELF/ARM/reg-names.s
llvm/test/tools/llvm-objdump/ELF/ARM/unknown-instr.test
llvm/test/tools/llvm-objdump/ELF/ARM/v5t-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v5te-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v5tej-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v6-neg-subfeatures.s
llvm/test/tools/llvm-objdump/ELF/ARM/v6-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v6-subfeatures.s
llvm/test/tools/llvm-objdump/ELF/ARM/v6k-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v6m-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v6t2-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v7a-neg-subfeature.s
llvm/test/tools/llvm-objdump/ELF/ARM/v7a-subfeature.s
llvm/test/tools/llvm-objdump/ELF/ARM/v7m-neg-subfeatures.s
llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subfeatures.s
llvm/test/tools/llvm-objdump/ELF/ARM/v8a-subarch.s
llvm/test/tools/llvm-objdump/ELF/ARM/v8r-subarch.s
llvm/test/tools/llvm-objdump/ELF/file-headers.test
llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32-fat.test
llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32.s
llvm/test/tools/llvm-objdump/MachO/AArch64/mach-print-armv8crypto.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64e.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-fat-arm-disasm.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-kextbundle.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-mrs.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread-arm64_32.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-symbolized-disassembly.test
llvm/test/tools/llvm-objdump/MachO/AArch64/macho-zerofill.s
llvm/test/tools/llvm-objdump/MachO/ARM/arch-armv7m-flag.test
llvm/test/tools/llvm-objdump/MachO/ARM/arm-and-thumb.test
llvm/test/tools/llvm-objdump/MachO/ARM/data-in-code.test
llvm/test/tools/llvm-objdump/MachO/ARM/it-nv.txt
llvm/test/tools/llvm-objdump/MachO/ARM/mattr-arm.test
llvm/test/tools/llvm-objdump/MachO/ARM/mcpu-arm.test
llvm/test/tools/llvm-objdump/MachO/ARM/mh_dylib_header.test
llvm/test/tools/llvm-objdump/MachO/ARM/private-headers.test
llvm/test/tools/llvm-objdump/MachO/ARM/symbolized-disassembly.test
llvm/test/tools/llvm-objdump/MachO/ARM/v7m.test
llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test
llvm/test/tools/llvm-objdump/MachO/archive-headers.test
llvm/test/tools/llvm-objdump/MachO/bad-bind.test
llvm/test/tools/llvm-objdump/MachO/bad-ordinal.test
llvm/test/tools/llvm-objdump/MachO/bad-trie.test
llvm/test/tools/llvm-objdump/MachO/bind.test
llvm/test/tools/llvm-objdump/MachO/bind2.test
llvm/test/tools/llvm-objdump/MachO/build-version.yaml
llvm/test/tools/llvm-objdump/MachO/compact-unwind-i386.test
llvm/test/tools/llvm-objdump/MachO/compact-unwind-x86_64.test
llvm/test/tools/llvm-objdump/MachO/cstring-dump.test
llvm/test/tools/llvm-objdump/MachO/data-in-code.ll
llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test
llvm/test/tools/llvm-objdump/MachO/dis-symname.test
llvm/test/tools/llvm-objdump/MachO/disassemble-all.test
llvm/test/tools/llvm-objdump/MachO/disassemble-g-dsym.test
llvm/test/tools/llvm-objdump/MachO/disassemble-kextbundle.test
llvm/test/tools/llvm-objdump/MachO/disassemble-stab.test
llvm/test/tools/llvm-objdump/MachO/disassemble-stripped.test
llvm/test/tools/llvm-objdump/MachO/dylib.test
llvm/test/tools/llvm-objdump/MachO/eh_frame-arm64.test
llvm/test/tools/llvm-objdump/MachO/exports-trie.test
llvm/test/tools/llvm-objdump/MachO/image-info.test
llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test
llvm/test/tools/llvm-objdump/MachO/info-plist-nofollow.test
llvm/test/tools/llvm-objdump/MachO/info-plist.test
llvm/test/tools/llvm-objdump/MachO/lazy-bind.test
llvm/test/tools/llvm-objdump/MachO/literal-pointers-i386.test
llvm/test/tools/llvm-objdump/MachO/literal-pointers-x86_64.test
llvm/test/tools/llvm-objdump/MachO/literals.test
llvm/test/tools/llvm-objdump/MachO/maccatalyst-build-version.yaml
llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test
llvm/test/tools/llvm-objdump/MachO/malformed-machos.test
llvm/test/tools/llvm-objdump/MachO/malformed-unwind-x86_64.test
llvm/test/tools/llvm-objdump/MachO/malformed.test
llvm/test/tools/llvm-objdump/MachO/nofirst-symbol-disassembly.test
llvm/test/tools/llvm-objdump/MachO/nontext-disasm.test
llvm/test/tools/llvm-objdump/MachO/objc-meta-data.test
llvm/test/tools/llvm-objdump/MachO/preload-relocations.test
llvm/test/tools/llvm-objdump/MachO/print-thread.test
llvm/test/tools/llvm-objdump/MachO/private-header.test
llvm/test/tools/llvm-objdump/MachO/private-headers.test
llvm/test/tools/llvm-objdump/MachO/rebase.test
llvm/test/tools/llvm-objdump/MachO/relocations.test
llvm/test/tools/llvm-objdump/MachO/section-contents.test
llvm/test/tools/llvm-objdump/MachO/section-headers.test
llvm/test/tools/llvm-objdump/MachO/section.test
llvm/test/tools/llvm-objdump/MachO/sections.test
llvm/test/tools/llvm-objdump/MachO/stub-nosyms-disassembly.test
llvm/test/tools/llvm-objdump/MachO/stubbed-dylib.test
llvm/test/tools/llvm-objdump/MachO/symbol-table.test
llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test
llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor-i386.test
llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor.test
llvm/test/tools/llvm-objdump/MachO/truncated-section.test
llvm/test/tools/llvm-objdump/MachO/universal-x86_64.i386.test
llvm/test/tools/llvm-objdump/MachO/unwind-info-arm64.test
llvm/test/tools/llvm-objdump/MachO/unwind-info-no-relocs.test
llvm/test/tools/llvm-objdump/MachO/unwind-info-x86_64.test
llvm/test/tools/llvm-objdump/MachO/unwind-info.test
llvm/test/tools/llvm-objdump/MachO/weak-bind.test
llvm/test/tools/llvm-objdump/X86/disassemble-align.s
llvm/test/tools/llvm-objdump/X86/disassemble-show-raw.test
llvm/test/tools/llvm-objdump/X86/function-sections-line-numbers.s
llvm/test/tools/llvm-objdump/X86/invalid-macho-build-version.yaml
llvm/test/tools/llvm-objdump/X86/plt.test
llvm/test/tools/llvm-objdump/X86/section-index.s
llvm/test/tools/llvm-objdump/archive-headers.test
llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
llvm/test/tools/llvm-objdump/embedded-source.test
llvm/test/tools/llvm-objdump/file-headers-pe.test
llvm/test/tools/llvm-objdump/invalid-input.test
llvm/test/tools/llvm-objdump/malformed-archives.test
llvm/test/tools/llvm-objdump/wasm/file-headers-unsupported.test
llvm/test/tools/llvm-objdump/wasm/wasm.txt
Removed:
################################################################################
diff --git a/llvm/test/tools/llvm-objdump/COFF/eh_frame.test b/llvm/test/tools/llvm-objdump/COFF/eh_frame.test
index ad37ebc11992..ff48331ffa2a 100644
--- a/llvm/test/tools/llvm-objdump/COFF/eh_frame.test
+++ b/llvm/test/tools/llvm-objdump/COFF/eh_frame.test
@@ -1,4 +1,4 @@
-# RUN: yaml2obj %p/Inputs/eh_frame-coff.yaml | llvm-objdump -dwarf=frames - 2>/dev/null | FileCheck %s
+# RUN: yaml2obj %p/Inputs/eh_frame-coff.yaml | llvm-objdump --dwarf=frames - 2>/dev/null | FileCheck %s
# CHECK: .eh_frame contents:
diff --git a/llvm/test/tools/llvm-objdump/COFF/file-headers.test b/llvm/test/tools/llvm-objdump/COFF/file-headers.test
index bdfc3248e147..60f7bd5ce333 100644
--- a/llvm/test/tools/llvm-objdump/COFF/file-headers.test
+++ b/llvm/test/tools/llvm-objdump/COFF/file-headers.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s -o %t
# RUN: llvm-objdump -f %t | FileCheck %s -DFILE=%t
-# RUN: llvm-objdump -file-headers %t | FileCheck %s -DFILE=%t
+# RUN: llvm-objdump --file-headers %t | FileCheck %s -DFILE=%t
!COFF
header: !Header
diff --git a/llvm/test/tools/llvm-objdump/ELF/AArch64/plt.test b/llvm/test/tools/llvm-objdump/ELF/AArch64/plt.test
index c08ff1ccca68..6238cf5565f7 100644
--- a/llvm/test/tools/llvm-objdump/ELF/AArch64/plt.test
+++ b/llvm/test/tools/llvm-objdump/ELF/AArch64/plt.test
@@ -6,7 +6,7 @@
# CHECK: bl {{.*}} <__cfi_slowpath at plt>
# RUN: yaml2obj %s -o %t.aarch64
-# RUN: llvm-objdump -d -mattr=+bti %t.aarch64 | \
+# RUN: llvm-objdump -d --mattr=+bti %t.aarch64 | \
# RUN: FileCheck --check-prefix=CHECK-BTI %s
# CHECK-BTI: bl {{.*}} <f1 at plt>
# CHECK-BTI: bl {{.*}} <f2 at plt>
diff --git a/llvm/test/tools/llvm-objdump/ELF/AMDGPU/source-lines.ll b/llvm/test/tools/llvm-objdump/ELF/AMDGPU/source-lines.ll
index 0fbed0a8178e..6258d48748e2 100644
--- a/llvm/test/tools/llvm-objdump/ELF/AMDGPU/source-lines.ll
+++ b/llvm/test/tools/llvm-objdump/ELF/AMDGPU/source-lines.ll
@@ -1,7 +1,7 @@
; RUN: sed -e "s,SRC_COMPDIR,%/p/Inputs,g" %s > %t.ll
; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx802 -filetype=obj -O0 -o %t.o %t.ll
-; RUN: llvm-objdump -triple=amdgcn-amd-amdhsa -mcpu=gfx802 -disassemble -line-numbers %t.o | FileCheck --check-prefix=LINE %t.ll
-; RUN: llvm-objdump -triple=amdgcn-amd-amdhsa -mcpu=gfx802 -disassemble -source %t.o | FileCheck --check-prefix=SOURCE %t.ll
+; RUN: llvm-objdump --triple=amdgcn-amd-amdhsa --mcpu=gfx802 -d -l %t.o | FileCheck --check-prefix=LINE %t.ll
+; RUN: llvm-objdump --triple=amdgcn-amd-amdhsa --mcpu=gfx802 -d -S %t.o | FileCheck --check-prefix=SOURCE %t.ll
; Prologue.
; LINE: source_lines_test{{>?}}:
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/reg-names.s b/llvm/test/tools/llvm-objdump/ELF/ARM/reg-names.s
index e1e12d8ba599..3ba7acf86671 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/reg-names.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/reg-names.s
@@ -1,5 +1,5 @@
@ RUN: llvm-mc %s -triple armv5-unknown-linux -filetype=obj -o %t
-@ RUN: llvm-objdump -d %t | FileCheck -check-prefix=STD %s
+@ RUN: llvm-objdump -d %t | FileCheck --check-prefix=STD %s
@ RUN: llvm-objdump -d -Mreg-names-std %t \
@ RUN: | FileCheck -check-prefix=STD %s
@ RUN: llvm-objdump -d --disassembler-options=reg-names-raw %t \
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/unknown-instr.test b/llvm/test/tools/llvm-objdump/ELF/ARM/unknown-instr.test
index 8055e63c1874..cb990b85dfce 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/unknown-instr.test
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/unknown-instr.test
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s -o %t
-# RUN: llvm-objdump -D -triple=thumbv8.1m.main-none-eabi %t | FileCheck %s
+# RUN: llvm-objdump -D --triple=thumbv8.1m.main-none-eabi %t | FileCheck %s
## This is a test case with "random" data/instructions, checking that
## llvm-objdump handles such instructions cleanly. Disassembly of instructions
@@ -10,7 +10,7 @@
##
## and disassembly is attempted with:
##
-## llvm-objdump -mattr=+ext1
+## llvm-objdump --mattr=+ext1
# CHECK: 00000000 <.text>:
# CHECK-NEXT: 0: cb <unknown>
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v5t-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v5t-subarch.s
index c9ce2cf6cebd..9013e189ec60 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v5t-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v5t-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv5t-elf -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv5t-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.arch armv5t
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v5te-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v5te-subarch.s
index 87e8548fb014..3ccfed21fd5c 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v5te-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v5te-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv5te-elf -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv5te-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.arch armv5te
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v5tej-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v5tej-subarch.s
index 42dc87389a34..32b3f8280521 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v5tej-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v5tej-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv5tej-elf -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv5tej-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
bxj:
bxj r0
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v6-neg-subfeatures.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v6-neg-subfeatures.s
index 1a8d8f283336..db262a35803c 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v6-neg-subfeatures.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v6-neg-subfeatures.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.eabi_attribute Tag_FP_arch, 1 // VFP2
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subarch.s
index c70761e7c8c5..8297c10f8dbc 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv6-elf -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv6-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.arch armv6
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subfeatures.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subfeatures.s
index e8e806740d19..a00f5dc22f92 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subfeatures.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v6-subfeatures.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.eabi_attribute Tag_FP_arch, 2 // VFP2
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v6k-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v6k-subarch.s
index 8df4ce5e2576..09241bd5be53 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v6k-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v6k-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv6k-elf -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv6k-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.arch armv6k
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v6m-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v6m-subarch.s
index f4c56989c17e..d09badfce457 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v6m-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v6m-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv6m-elf -filetype=obj | llvm-objdump -triple=thumb -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv6m-elf -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s
.arch armv6m
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v6t2-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v6t2-subarch.s
index 36e134342972..748b63258038 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v6t2-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v6t2-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv6t2-elf -filetype=obj | llvm-objdump -triple=thumb -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv6t2-elf -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s
.arch armv6t2
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-neg-subfeature.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-neg-subfeature.s
index 8083e5b0eee0..37226b671d88 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-neg-subfeature.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-neg-subfeature.s
@@ -1,5 +1,5 @@
-@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm,+hwdiv -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
-@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm,+hwdiv -filetype=obj | llvm-objdump -triple=thumb -d - | FileCheck %s --check-prefix=CHECK-THUMB
+@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm,+hwdiv -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm,+hwdiv -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s --check-prefix=CHECK-THUMB
.eabi_attribute Tag_FP_arch, 0 // disallow vfp
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-subfeature.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-subfeature.s
index f43554579a36..be29cd83f111 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-subfeature.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v7a-subfeature.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.eabi_attribute Tag_FP_arch, 3 // VFP3
.eabi_attribute Tag_Advanced_SIMD_arch, 2 // SIMDv1 with fp16
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-neg-subfeatures.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-neg-subfeatures.s
index b3a79c7d5c2b..03388362d935 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-neg-subfeatures.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-neg-subfeatures.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump -triple=thumb -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s
.eabi_attribute Tag_CPU_arch, 10 // v7
.eabi_attribute Tag_FP_arch, 0 // VFP4
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subarch.s
index 8f6ff57e0ff3..3635cb6ca1ff 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv7m-elf -filetype=obj | llvm-objdump -triple=thumb -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7m-elf -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s
.arch armv7m
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subfeatures.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subfeatures.s
index c7a40af8ae90..e27158301b4f 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subfeatures.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subfeatures.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump -triple=thumb -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s
.eabi_attribute Tag_CPU_arch, 10 // v7
.eabi_attribute Tag_CPU_arch_profile, 0x4D // 'M' profile
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v8a-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v8a-subarch.s
index de3ce59a0d4a..d62c7dc97ccb 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v8a-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v8a-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv8a-elf -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv8a-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.arch armv8a
diff --git a/llvm/test/tools/llvm-objdump/ELF/ARM/v8r-subarch.s b/llvm/test/tools/llvm-objdump/ELF/ARM/v8r-subarch.s
index fd58544b3a5d..a969a14c25cf 100644
--- a/llvm/test/tools/llvm-objdump/ELF/ARM/v8r-subarch.s
+++ b/llvm/test/tools/llvm-objdump/ELF/ARM/v8r-subarch.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv8r-elf -filetype=obj | llvm-objdump -triple=arm -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv8r-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s
.eabi_attribute Tag_CPU_arch, 15 // v8_R
.eabi_attribute Tag_CPU_arch_profile, 0x52 // 'R' profile
diff --git a/llvm/test/tools/llvm-objdump/ELF/file-headers.test b/llvm/test/tools/llvm-objdump/ELF/file-headers.test
index 237818bab2db..57f9f1d50c3d 100644
--- a/llvm/test/tools/llvm-objdump/ELF/file-headers.test
+++ b/llvm/test/tools/llvm-objdump/ELF/file-headers.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj --docnum=1 %s -o %t
-# RUN: llvm-objdump -f %t | FileCheck %s -DFILE=%t -check-prefix ELF64
-# RUN: llvm-objdump -file-headers %t | FileCheck %s -DFILE=%t -check-prefix ELF64
+# RUN: llvm-objdump -f %t | FileCheck %s -DFILE=%t --check-prefix ELF64
+# RUN: llvm-objdump --file-headers %t | FileCheck %s -DFILE=%t --check-prefix ELF64
!ELF
FileHeader:
@@ -15,8 +15,8 @@ FileHeader:
# ELF64: start address: 0x00123456789abcde
# RUN: yaml2obj --docnum=2 %s -o %t-i386
-# RUN: llvm-objdump -f %t-i386 | FileCheck -DFILE=%t-i386 %s -check-prefix ELF32
-# RUN: llvm-objdump -file-headers %t-i386 | FileCheck %s -DFILE=%t-i386 -check-prefix ELF32
+# RUN: llvm-objdump -f %t-i386 | FileCheck -DFILE=%t-i386 %s --check-prefix ELF32
+# RUN: llvm-objdump --file-headers %t-i386 | FileCheck %s -DFILE=%t-i386 --check-prefix ELF32
# ELF32: [[FILE]]: file format elf32-i386
# ELF32: architecture: i386
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32-fat.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32-fat.test
index dc9b319e3c45..898c3e6d6c5a 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32-fat.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32-fat.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -universal-headers %p/Inputs/arm64_32-fat.o | FileCheck %s
+RUN: llvm-objdump --macho --universal-headers %p/Inputs/arm64_32-fat.o | FileCheck %s
CHECK: cputype CPU_TYPE_ARM64_32
CHECK-NEXT: cpusubtype CPU_SUBTYPE_ARM64_32_V8
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32.s b/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32.s
index 050719d90515..69d01ee0c267 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32.s
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/arm64_32.s
@@ -1,6 +1,6 @@
// RUN: llvm-mc -triple arm64_32-apple-watchos %s -filetype=obj -o %t
-// RUN: llvm-objdump -macho -d %t | FileCheck %s
-// RUN: llvm-objdump -macho -private-headers %t | FileCheck %s --check-prefix=CHECK-HEADERS
+// RUN: llvm-objdump --macho -d %t | FileCheck %s
+// RUN: llvm-objdump --macho --private-headers %t | FileCheck %s --check-prefix=CHECK-HEADERS
// CHECK: ldr x0, [x2]
ldr x0, [x2]
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/mach-print-armv8crypto.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/mach-print-armv8crypto.test
index e5ac0cb453e4..b470c9c42521 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/mach-print-armv8crypto.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/mach-print-armv8crypto.test
@@ -1,3 +1,3 @@
-RUN: llvm-objdump -d -m -no-show-raw-insn %p/Inputs/print-armv8crypto.obj.macho-aarch64 | FileCheck %s
+RUN: llvm-objdump -d -m --no-show-raw-insn %p/Inputs/print-armv8crypto.obj.macho-aarch64 | FileCheck %s
CHECK: 0: sha1su0.4s v0, v1, v2
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64e.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64e.test
index cd001cf7815f..e40a96b770e2 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64e.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64e.test
@@ -1,5 +1,5 @@
// RUN: yaml2obj %p/Inputs/arm64e.macho.yaml -o %tarm64e.o
-// RUN: llvm-objdump -p %tarm64e.o | FileCheck -strict-whitespace %s
+// RUN: llvm-objdump -p %tarm64e.o | FileCheck --strict-whitespace %s
CHECK: Mach header
CHECK-NEXT: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-fat-arm-disasm.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-fat-arm-disasm.test
index 31acba8dbcbd..9d21ea3a54dd 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-fat-arm-disasm.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-fat-arm-disasm.test
@@ -1,5 +1,5 @@
-RUN: llvm-objdump -d -m -no-show-raw-insn -arch all %p/Inputs/fat.macho-armv7s-arm64 >%t0
-RUN: llvm-objdump -dm -no-show-raw-insn -arch all %p/Inputs/fat.macho-armv7s-arm64 >%t1
+RUN: llvm-objdump -d -m --no-show-raw-insn --arch all %p/Inputs/fat.macho-armv7s-arm64 >%t0
+RUN: llvm-objdump --dm --no-show-raw-insn --arch all %p/Inputs/fat.macho-armv7s-arm64 >%t1
RUN: cmp %t0 %t1
RUN: FileCheck --input-file %t0 %s
REQUIRES: arm-registered-target
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-kextbundle.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-kextbundle.test
index 89194554e9cb..60429f10b7b9 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-kextbundle.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-kextbundle.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -d -m -no-show-raw-insn %p/Inputs/kextbundle.macho-aarch64 | FileCheck %s
+RUN: llvm-objdump -d -m --no-show-raw-insn %p/Inputs/kextbundle.macho-aarch64 | FileCheck %s
CHECK: (__TEXT_EXEC,__text) section
CHECK: _foo:
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test
index 932bc4fa8380..2f39aba92af9 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -m -link-opt-hints %p/Inputs/link-opt-hints.macho-aarch64 | FileCheck %s
+RUN: llvm-objdump -m --link-opt-hints %p/Inputs/link-opt-hints.macho-aarch64 | FileCheck %s
CHECK: Linker optimiztion hints (8 total bytes)
CHECK: identifier 8 AdrpLdrGot
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-mrs.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-mrs.test
index c629a4de3876..cd40f0e849c5 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-mrs.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-mrs.test
@@ -1,3 +1,3 @@
-RUN: llvm-objdump -d -m -no-show-raw-insn %p/Inputs/print-mrs.obj.macho-aarch64 | FileCheck %s
+RUN: llvm-objdump -d -m --no-show-raw-insn %p/Inputs/print-mrs.obj.macho-aarch64 | FileCheck %s
CHECK: 0: mrs x0, CPM_IOACC_CTL_EL3
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread-arm64_32.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread-arm64_32.test
index 7bacb54ae80f..16c719b261c6 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread-arm64_32.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread-arm64_32.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -private-headers %p/Inputs/thread.macho-arm64_32 | FileCheck %s
+RUN: llvm-objdump --macho --private-headers %p/Inputs/thread.macho-arm64_32 | FileCheck %s
CHECK: Load command 0
CHECK: cmd LC_UNIXTHREAD
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread.test
index 86f5569a03b7..a76197620c85 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -private-headers %p/Inputs/thread.macho-aarch64 | FileCheck %s
+RUN: llvm-objdump --macho --private-headers %p/Inputs/thread.macho-aarch64 | FileCheck %s
CHECK: Load command 0
CHECK: cmd LC_THREAD
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-symbolized-disassembly.test
index 4c88b94396bb..f26f06793f7e 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-symbolized-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-symbolized-disassembly.test
@@ -1,7 +1,7 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-aarch64 | FileCheck %s -check-prefix=OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-aarch64 | FileCheck %s -check-prefix=EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.obj.macho-aarch64 | FileCheck %s -check-prefix=ObjC-OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.exe.macho-aarch64 | FileCheck %s -check-prefix=ObjC-EXE
+// RUN: llvm-objdump -d -m --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.obj.macho-aarch64 | FileCheck %s --check-prefix=OBJ
+// RUN: llvm-objdump -d -m --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.exe.macho-aarch64 | FileCheck %s --check-prefix=EXE
+// RUN: llvm-objdump -d -m --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/ObjC.obj.macho-aarch64 | FileCheck %s --check-prefix=ObjC-OBJ
+// RUN: llvm-objdump -d -m --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/ObjC.exe.macho-aarch64 | FileCheck %s --check-prefix=ObjC-EXE
OBJ: 000000000000001c adrp x0, L_.str at PAGE
OBJ: 0000000000000020 add x0, x0, L_.str at PAGEOFF
diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-zerofill.s b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-zerofill.s
index dec8514e4425..37141a0683ba 100644
--- a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-zerofill.s
+++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-zerofill.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc < %s -triple aarch64-macho -filetype=obj | llvm-objdump -triple=aarch64-- -D - | FileCheck %s
+// RUN: llvm-mc < %s -triple aarch64-macho -filetype=obj | llvm-objdump --triple=aarch64-- -D - | FileCheck %s
// Check that we don't print garbage when we dump zerofill sections.
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/arch-armv7m-flag.test b/llvm/test/tools/llvm-objdump/MachO/ARM/arch-armv7m-flag.test
index 6a19e3066664..c88ba9bc2f49 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/arch-armv7m-flag.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/arch-armv7m-flag.test
@@ -1,4 +1,4 @@
-@ RUN: llvm-objdump -macho -d -arch armv7m %p/Inputs/fat-armv7m.o | FileCheck %s
+@ RUN: llvm-objdump --macho -d --arch armv7m %p/Inputs/fat-armv7m.o | FileCheck %s
@ CHECK: fat-armv7m.o:
@ CHECK: (__TEXT,__text) section
@ CHECK: foo:
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/arm-and-thumb.test b/llvm/test/tools/llvm-objdump/MachO/ARM/arm-and-thumb.test
index fab64f549ef4..57e8879701e1 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/arm-and-thumb.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/arm-and-thumb.test
@@ -1,5 +1,5 @@
@ RUN: llvm-mc < %s -triple armv7-apple-darwin -filetype=obj | llvm-objdump -m -d - | FileCheck %s
-@ RUN: llvm-mc < %s -triple armv7-apple-darwin -filetype=obj | llvm-objdump -arch armv7 -m -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7-apple-darwin -filetype=obj | llvm-objdump --arch armv7 -m -d - | FileCheck %s
.thumb
.thumb_func _t
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/data-in-code.test b/llvm/test/tools/llvm-objdump/MachO/ARM/data-in-code.test
index c7a6da1d9504..b2f2b3e09a20 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/data-in-code.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/data-in-code.test
@@ -1,5 +1,5 @@
-RUN: llvm-objdump -m -data-in-code %p/Inputs/data-in-code.macho-arm | FileCheck %s
-RUN: llvm-objdump -m -data-in-code -non-verbose %p/Inputs/data-in-code.macho-arm | FileCheck %s -check-prefix=NON_VERBOSE
+RUN: llvm-objdump -m --data-in-code %p/Inputs/data-in-code.macho-arm | FileCheck %s
+RUN: llvm-objdump -m --data-in-code --non-verbose %p/Inputs/data-in-code.macho-arm | FileCheck %s --check-prefix=NON_VERBOSE
CHECK: Data in code table (4 entries)
CHECK: offset length kind
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/it-nv.txt b/llvm/test/tools/llvm-objdump/MachO/ARM/it-nv.txt
index 561f97bbb8b1..394ecb8156f2 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/it-nv.txt
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/it-nv.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -macho -d %p/Inputs/it-nv.o | FileCheck %s
+# RUN: llvm-objdump --macho -d %p/Inputs/it-nv.o | FileCheck %s
# CHECK: ite al @ unpredictable IT predicate sequence
# CHECK: itet al @ unpredictable IT predicate sequence
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/mattr-arm.test b/llvm/test/tools/llvm-objdump/MachO/ARM/mattr-arm.test
index 1b1714640c89..824260b13981 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/mattr-arm.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/mattr-arm.test
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple armv8-apple-darwin10 -mattr=+fp-armv8 -filetype=obj -o - | llvm-objdump -d -m -mattr=+fp-armv8 - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv8-apple-darwin10 -mattr=+fp-armv8 -filetype=obj -o - | llvm-objdump -d -m --mattr=+fp-armv8 - | FileCheck %s
vcvtt.f64.f16 d3, s1
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/mcpu-arm.test b/llvm/test/tools/llvm-objdump/MachO/ARM/mcpu-arm.test
index 7a3432d9e1a8..fed00c5fdb91 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/mcpu-arm.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/mcpu-arm.test
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc < %s -triple thumbv7-apple-darwin -mcpu=cortex-a7 -filetype=obj | llvm-objdump -triple thumbv7-apple-darwin10 -m -d -mcpu=cortex-a7 - | FileCheck %s
+@ RUN: llvm-mc < %s -triple thumbv7-apple-darwin -mcpu=cortex-a7 -filetype=obj | llvm-objdump --triple thumbv7-apple-darwin10 -m -d --mcpu=cortex-a7 - | FileCheck %s
.thumb
.thumb_func _t
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/mh_dylib_header.test b/llvm/test/tools/llvm-objdump/MachO/ARM/mh_dylib_header.test
index 474080392c83..c68d2ddffa7c 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/mh_dylib_header.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/mh_dylib_header.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -d -macho %p/Inputs/mh_dylib_header.macho-arm
+RUN: llvm-objdump -d --macho %p/Inputs/mh_dylib_header.macho-arm
CHECK: _t1:
CHECK: movw r0, #4133
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/private-headers.test b/llvm/test/tools/llvm-objdump/MachO/ARM/private-headers.test
index 53004c72e37c..96b1759ed35f 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/private-headers.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/private-headers.test
@@ -1,7 +1,7 @@
// RUN: llvm-objdump -p %p/Inputs/hello.obj.macho-arm | FileCheck %s
// RUN: llvm-objdump -p %p/Inputs/hello.exe.macho-arm \
// RUN: | FileCheck %s -check-prefix=EXE
-// RUN: llvm-objdump -macho -private-headers %p/Inputs/thumb.armv7m \
+// RUN: llvm-objdump --macho --private-headers %p/Inputs/thumb.armv7m \
// RUN: | FileCheck %s -check-prefix=THREAD
CHECK: Mach header
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/ARM/symbolized-disassembly.test
index 2b7e44e940bb..730a000a373f 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/symbolized-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/symbolized-disassembly.test
@@ -1,5 +1,5 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-arm | FileCheck %s -check-prefix=OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-arm | FileCheck %s -check-prefix=EXE
+// RUN: llvm-objdump -d -m --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.obj.macho-arm | FileCheck %s --check-prefix=OBJ
+// RUN: llvm-objdump -d -m --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.exe.macho-arm | FileCheck %s --check-prefix=EXE
OBJ: 00000006 40 f2 24 03 movw r3, :lower16:((54-14)-4)
OBJ: 0000000a c0 f2 00 03 movt r3, :upper16:((54-14)-4)
diff --git a/llvm/test/tools/llvm-objdump/MachO/ARM/v7m.test b/llvm/test/tools/llvm-objdump/MachO/ARM/v7m.test
index 3ba112205615..1f7bf6986367 100644
--- a/llvm/test/tools/llvm-objdump/MachO/ARM/v7m.test
+++ b/llvm/test/tools/llvm-objdump/MachO/ARM/v7m.test
@@ -1,5 +1,5 @@
-@ RUN: llvm-mc < %s -triple thumbv7m-apple-macho -filetype=obj | llvm-objdump -macho -d - | FileCheck %s
-@ RUN: llvm-mc < %s -triple thumbv7em-apple-macho -filetype=obj | llvm-objdump -macho -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple thumbv7m-apple-macho -filetype=obj | llvm-objdump --macho -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple thumbv7em-apple-macho -filetype=obj | llvm-objdump --macho -d - | FileCheck %s
.thumb
.thumb_func _t
diff --git a/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test b/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test
index 778f77d31348..9314f1126cec 100644
--- a/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test
+++ b/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test
@@ -1,5 +1,5 @@
# REQUIRES: xar
-# RUN: env ASAN_OPTIONS=detect_leaks=0 llvm-objdump -macho -archive-headers -section __LLVM,__bundle %p/Inputs/LLVM-bundle.macho-x86_64 | FileCheck %s
+# RUN: env ASAN_OPTIONS=detect_leaks=0 llvm-objdump --macho --archive-headers --section __LLVM,__bundle %p/Inputs/LLVM-bundle.macho-x86_64 | FileCheck %s
# CHECK: For (__LLVM,__bundle) section: xar header
# CHECK: magic XAR_HEADER_MAGIC
diff --git a/llvm/test/tools/llvm-objdump/MachO/archive-headers.test b/llvm/test/tools/llvm-objdump/MachO/archive-headers.test
index 1253b46529b9..946671a53dfd 100644
--- a/llvm/test/tools/llvm-objdump/MachO/archive-headers.test
+++ b/llvm/test/tools/llvm-objdump/MachO/archive-headers.test
@@ -1,8 +1,8 @@
-RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -macho -archive-headers -arch all \
+RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 --macho --archive-headers --arch all \
RUN: | FileCheck %s
-RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -macho -archive-headers -arch all -archive-member-offsets \
+RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 --macho --archive-headers --arch all --archive-member-offsets \
RUN: | FileCheck %s -check-prefix=OFFSETS
-RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -macho -archive-headers -arch all -non-verbose \
+RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 --macho --archive-headers --arch all --non-verbose \
RUN: | FileCheck %s -check-prefix=NON-VERBOSE
# Note the date as printed by ctime(3) is time zone dependent and not checked.
diff --git a/llvm/test/tools/llvm-objdump/MachO/bad-bind.test b/llvm/test/tools/llvm-objdump/MachO/bad-bind.test
index fe089d429290..d11c4fb88395 100644
--- a/llvm/test/tools/llvm-objdump/MachO/bad-bind.test
+++ b/llvm/test/tools/llvm-objdump/MachO/bad-bind.test
@@ -1,101 +1,101 @@
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-dylib-ordinal-uleb 2>&1 | FileCheck -check-prefix DYLIB-ORDINAL-ULEB %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-dylib-ordinal-uleb 2>&1 | FileCheck --check-prefix DYLIB-ORDINAL-ULEB %s
DYLIB-ORDINAL-ULEB: macho-bind-dylib-ordinal-uleb': truncated or malformed object (for BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB bad library ordinal: 355 (max 1) for opcode at: 0x0)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-dylib-ordinal-uleb-malformed-uleb128 2>&1 | FileCheck -check-prefix DYLIB-ORDINAL-ULEB-MALFORMED-ULEB128 %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-dylib-ordinal-uleb-malformed-uleb128 2>&1 | FileCheck --check-prefix DYLIB-ORDINAL-ULEB-MALFORMED-ULEB128 %s
DYLIB-ORDINAL-ULEB-MALFORMED-ULEB128: macho-bind-dylib-ordinal-uleb-malformed-uleb128': truncated or malformed object (for BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB malformed uleb128, extends past end for opcode at: 0x0)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-dylib-ordinal-uleb-too-big 2>&1 | FileCheck -check-prefix DYLIB-ORDINAL-ULEB-TOO-BIG %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-dylib-ordinal-uleb-too-big 2>&1 | FileCheck --check-prefix DYLIB-ORDINAL-ULEB-TOO-BIG %s
DYLIB-ORDINAL-ULEB-TOO-BIG: macho-bind-dylib-ordinal-uleb-too-big': truncated or malformed object (for BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB uleb128 too big for uint64 for opcode at: 0x0)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-dylib-special-imm 2>&1 | FileCheck -check-prefix DYLIB-SPECIAL-IMM %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-dylib-special-imm 2>&1 | FileCheck --check-prefix DYLIB-SPECIAL-IMM %s
DYLIB-SPECIAL-IMM: macho-bind-dylib-special-imm': truncated or malformed object (for BIND_OPCODE_SET_DYLIB_SPECIAL_IMM unknown special ordinal: -5 for opcode at: 0x0)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-set-symbol 2>&1 | FileCheck -check-prefix BIND-SET-SYMBOL %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-set-symbol 2>&1 | FileCheck --check-prefix BIND-SET-SYMBOL %s
BIND-SET-SYMBOL: macho-bind-set-symbol': truncated or malformed object (for BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM symbol name extends past opcodes for opcode at: 0x2)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-set-type-imm 2>&1 | FileCheck -check-prefix SET-TYPE-IMM %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-set-type-imm 2>&1 | FileCheck --check-prefix SET-TYPE-IMM %s
SET-TYPE-IMM: macho-bind-set-type-imm': truncated or malformed object (for BIND_OPCODE_SET_TYPE_IMM bad bind type: 5 for opcode at: 0x14)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-set-addend-sleb 2>&1 | FileCheck -check-prefix SET-ADDEND-SLEB %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-set-addend-sleb 2>&1 | FileCheck --check-prefix SET-ADDEND-SLEB %s
SET-ADDEND-SLEB: macho-bind-set-addend-sleb': truncated or malformed object (for BIND_OPCODE_SET_ADDEND_SLEB malformed sleb128, extends past end for opcode at: 0x14)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-seg-too-big 2>&1 | FileCheck -check-prefix SEG-TOO-BIG %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-seg-too-big 2>&1 | FileCheck --check-prefix SEG-TOO-BIG %s
SEG-TOO-BIG: macho-bind-seg-too-big': truncated or malformed object (for BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB bad segIndex (too large) for opcode at: 0x15)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-segoff-too-big 2>&1 | FileCheck -check-prefix SEGOFF-TOO-BIG %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-segoff-too-big 2>&1 | FileCheck --check-prefix SEGOFF-TOO-BIG %s
SEGOFF-TOO-BIG: macho-bind-segoff-too-big': truncated or malformed object (for BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB bad offset, not in section for opcode at: 0x15)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-add_addr_uleb 2>&1 | FileCheck -check-prefix ADD_ADDR_ULEB %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-add_addr_uleb 2>&1 | FileCheck --check-prefix ADD_ADDR_ULEB %s
ADD_ADDR_ULEB: macho-bind-add_addr_uleb': truncated or malformed object (for BIND_OPCODE_ADD_ADDR_ULEB bad offset, not in section for opcode at: 0x17)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-do-bind-no-segIndex 2>&1 | FileCheck -check-prefix BIND-NO-SEGINDEX %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-do-bind-no-segIndex 2>&1 | FileCheck --check-prefix BIND-NO-SEGINDEX %s
BIND-NO-SEGINDEX: macho-bind-do-bind-no-segIndex': truncated or malformed object (for BIND_OPCODE_DO_BIND missing preceding *_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB for opcode at: 0x15)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-bind-add-addr-uleb 2>&1 | FileCheck -check-prefix ADD-ADDR-ULEB %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-bind-add-addr-uleb 2>&1 | FileCheck --check-prefix ADD-ADDR-ULEB %s
ADD-ADDR-ULEB: macho-bind-bind-add-addr-uleb': truncated or malformed object (for BIND_OPCODE_ADD_ADDR_ULEB (after adding ULEB) bad offset, not in section for opcode at: 0x18)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-add-addr-imm-scaled 2>&1 | FileCheck -check-prefix ADD-ADDR-IMM-SCALED %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-add-addr-imm-scaled 2>&1 | FileCheck --check-prefix ADD-ADDR-IMM-SCALED %s
ADD-ADDR-IMM-SCALED: macho-bind-add-addr-imm-scaled': truncated or malformed object (for BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED bad offset, not in section for opcode at: 0x17)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-uleb-times-skipping-uleb 2>&1 | FileCheck -check-prefix ULEB-TIMES-SKIPPING-ULEB %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-uleb-times-skipping-uleb 2>&1 | FileCheck --check-prefix ULEB-TIMES-SKIPPING-ULEB %s
ULEB-TIMES-SKIPPING-ULEB: macho-bind-uleb-times-skipping-uleb': truncated or malformed object (for BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB bad offset, not in section for opcode at: 0x17)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-do-bind-no-symbol 2>&1 | FileCheck -check-prefix DO-BIND-NO-SYMBOL %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-do-bind-no-symbol 2>&1 | FileCheck --check-prefix DO-BIND-NO-SYMBOL %s
DO-BIND-NO-SYMBOL: macho-do-bind-no-symbol': truncated or malformed object (for BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM for opcode at: 0x5)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-do-bind-no-dylib-ordinal 2>&1 | FileCheck -check-prefix DO-BIND-NO-DYLIB-ORDINAL %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-do-bind-no-dylib-ordinal 2>&1 | FileCheck --check-prefix DO-BIND-NO-DYLIB-ORDINAL %s
DO-BIND-NO-DYLIB-ORDINAL: macho-do-bind-no-dylib-ordinal': truncated or malformed object (for BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL_* for opcode at: 0x15)
-RUN: not llvm-objdump -macho -bind %p/Inputs/macho-bind-bad-opcode-value 2>&1 | FileCheck -check-prefix BAD-OPCODE-VALUE %s
+RUN: not llvm-objdump --macho --bind %p/Inputs/macho-bind-bad-opcode-value 2>&1 | FileCheck --check-prefix BAD-OPCODE-VALUE %s
BAD-OPCODE-VALUE: macho-bind-bad-opcode-value': truncated or malformed object (bad bind info (bad opcode value 0xd0 for opcode at: 0x18)
-RUN: not llvm-objdump -macho -lazy-bind %p/Inputs/macho-lazy-do_bind_add_addr_uleb 2>&1 | FileCheck -check-prefix LAZY_DO_BIND_ADD_ADDR_ULEB %s
+RUN: not llvm-objdump --macho --lazy-bind %p/Inputs/macho-lazy-do_bind_add_addr_uleb 2>&1 | FileCheck --check-prefix LAZY_DO_BIND_ADD_ADDR_ULEB %s
LAZY_DO_BIND_ADD_ADDR_ULEB: macho-lazy-do_bind_add_addr_uleb': truncated or malformed object (BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB not allowed in lazy bind table for opcode at: 0xc)
-RUN: not llvm-objdump -macho -lazy-bind %p/Inputs/macho-lazy-do-bind-add-addr-imm-scaled 2>&1 | FileCheck -check-prefix LAZY-DO-BIND-ADD-ADDR-IMM-SCALED %s
+RUN: not llvm-objdump --macho --lazy-bind %p/Inputs/macho-lazy-do-bind-add-addr-imm-scaled 2>&1 | FileCheck --check-prefix LAZY-DO-BIND-ADD-ADDR-IMM-SCALED %s
LAZY-DO-BIND-ADD-ADDR-IMM-SCALED: macho-lazy-do-bind-add-addr-imm-scaled': truncated or malformed object (BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED not allowed in lazy bind table for opcode at: 0xc)
-RUN: not llvm-objdump -macho -lazy-bind %p/Inputs/macho-lazy-do-bind-uleb-times-skipping-uleb 2>&1 | FileCheck -check-prefix LAZY-DO-BIND-ULEB-TIMES-SKIPPING-ULEB %s
+RUN: not llvm-objdump --macho --lazy-bind %p/Inputs/macho-lazy-do-bind-uleb-times-skipping-uleb 2>&1 | FileCheck --check-prefix LAZY-DO-BIND-ULEB-TIMES-SKIPPING-ULEB %s
LAZY-DO-BIND-ULEB-TIMES-SKIPPING-ULEB: macho-lazy-do-bind-uleb-times-skipping-uleb': truncated or malformed object (BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB not allowed in lazy bind table for opcode at: 0xc)
-RUN: not llvm-objdump -macho -weak-bind %p/Inputs/macho-weak-bind-set-dylib-ordinal-imm 2>&1 | FileCheck -check-prefix WEAK-BIND-SET-DYLIB-ORDINAL-IMM %s
+RUN: not llvm-objdump --macho --weak-bind %p/Inputs/macho-weak-bind-set-dylib-ordinal-imm 2>&1 | FileCheck --check-prefix WEAK-BIND-SET-DYLIB-ORDINAL-IMM %s
WEAK-BIND-SET-DYLIB-ORDINAL-IMM: macho-weak-bind-set-dylib-ordinal-imm': truncated or malformed object (BIND_OPCODE_SET_DYLIB_ORDINAL_IMM not allowed in weak bind table for opcode at: 0x2)
-RUN: not llvm-objdump -macho -weak-bind %p/Inputs/macho-weak-bind-set-dylib-ordinal-uleb 2>&1 | FileCheck -check-prefix WEAK-BIND-SET-DYLIB-ORDINAL-ULEB %s
+RUN: not llvm-objdump --macho --weak-bind %p/Inputs/macho-weak-bind-set-dylib-ordinal-uleb 2>&1 | FileCheck --check-prefix WEAK-BIND-SET-DYLIB-ORDINAL-ULEB %s
WEAK-BIND-SET-DYLIB-ORDINAL-ULEB: macho-weak-bind-set-dylib-ordinal-uleb': truncated or malformed object (BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB not allowed in weak bind table for opcode at: 0x2)
-RUN: not llvm-objdump -macho -weak-bind %p/Inputs/macho-weak-bind-set-dylib-special-imm 2>&1 | FileCheck -check-prefix WEAK-BIND-SET-DYLIB-SPECIAL-IMM %s
+RUN: not llvm-objdump --macho --weak-bind %p/Inputs/macho-weak-bind-set-dylib-special-imm 2>&1 | FileCheck --check-prefix WEAK-BIND-SET-DYLIB-SPECIAL-IMM %s
WEAK-BIND-SET-DYLIB-SPECIAL-IMM: macho-weak-bind-set-dylib-special-imm': truncated or malformed object (BIND_OPCODE_SET_DYLIB_SPECIAL_IMM not allowed in weak bind table for opcode at: 0x2)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-set-type-imm 2>&1 | FileCheck -check-prefix REBASE-SET-TYPE-IMM %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-set-type-imm 2>&1 | FileCheck --check-prefix REBASE-SET-TYPE-IMM %s
REBASE-SET-TYPE-IMM: macho-rebase-set-type-imm': truncated or malformed object (for REBASE_OPCODE_SET_TYPE_IMM bad bind type: 5 for opcode at: 0x0)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-uleb-malformed-uleb128 2>&1 | FileCheck -check-prefix REBASE-ULEB-MALFORMED-ULEB128 %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-uleb-malformed-uleb128 2>&1 | FileCheck --check-prefix REBASE-ULEB-MALFORMED-ULEB128 %s
REBASE-ULEB-MALFORMED-ULEB128: macho-rebase-uleb-malformed-uleb128': truncated or malformed object (for REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB malformed uleb128, extends past end for opcode at: 0x1)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-seg-too-big 2>&1 | FileCheck -check-prefix REBASE-SEG-TOO-BIG %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-seg-too-big 2>&1 | FileCheck --check-prefix REBASE-SEG-TOO-BIG %s
REBASE-SEG-TOO-BIG: macho-rebase-seg-too-big': truncated or malformed object (for REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB bad segIndex (too large) for opcode at: 0x1)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-segoff-too-big 2>&1 | FileCheck -check-prefix REBASE-SEGOFF-TOO-BIG %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-segoff-too-big 2>&1 | FileCheck --check-prefix REBASE-SEGOFF-TOO-BIG %s
REBASE-SEGOFF-TOO-BIG: macho-rebase-segoff-too-big': truncated or malformed object (for REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB bad offset, not in section for opcode at: 0x1)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-add-addr-uleb 2>&1 | FileCheck -check-prefix REBASE-ADD-ADDR-ULEB %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-add-addr-uleb 2>&1 | FileCheck --check-prefix REBASE-ADD-ADDR-ULEB %s
REBASE-ADD-ADDR-ULEB: macho-rebase-add-addr-uleb': truncated or malformed object (for REBASE_OPCODE_ADD_ADDR_ULEB bad offset, not in section for opcode at: 0x3)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-add-addr-imm-scaled 2>&1 | FileCheck -check-prefix REBASE-ADD-ADDR-IMM-SCALED %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-add-addr-imm-scaled 2>&1 | FileCheck --check-prefix REBASE-ADD-ADDR-IMM-SCALED %s
REBASE-ADD-ADDR-IMM-SCALED: macho-rebase-add-addr-imm-scaled': truncated or malformed object (for REBASE_OPCODE_ADD_ADDR_IMM_SCALED bad offset, not in section for opcode at: 0x3)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-imm-times 2>&1 | FileCheck -check-prefix REBASE-IMM-TIMES %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-imm-times 2>&1 | FileCheck --check-prefix REBASE-IMM-TIMES %s
REBASE-IMM-TIMES: macho-rebase-imm-times': truncated or malformed object (for REBASE_OPCODE_DO_REBASE_IMM_TIMES bad offset, not in section for opcode at: 0x3)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-uleb-times 2>&1 | FileCheck -check-prefix REBASE-ULEB-TIMES %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-uleb-times 2>&1 | FileCheck --check-prefix REBASE-ULEB-TIMES %s
REBASE-ULEB-TIMES: macho-rebase-uleb-times': truncated or malformed object (for REBASE_OPCODE_DO_REBASE_ULEB_TIMES bad offset, not in section for opcode at: 0x3)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-add-addr-uleb-too-big 2>&1 | FileCheck -check-prefix REBASE-ADD-ADDR-ULEB-TOO-BIG %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-add-addr-uleb-too-big 2>&1 | FileCheck --check-prefix REBASE-ADD-ADDR-ULEB-TOO-BIG %s
REBASE-ADD-ADDR-ULEB-TOO-BIG: macho-rebase-add-addr-uleb-too-big': truncated or malformed object (for REBASE_OPCODE_DO_REBASE_IMM_TIMES bad offset, not in section for opcode at: 0x6)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-uleb-times-skipping-uleb 2>&1 | FileCheck -check-prefix REBASE-ULEB-TIMES-SKIPPING-ULEB %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-uleb-times-skipping-uleb 2>&1 | FileCheck --check-prefix REBASE-ULEB-TIMES-SKIPPING-ULEB %s
REBASE-ULEB-TIMES-SKIPPING-ULEB: macho-rebase-uleb-times-skipping-uleb': truncated or malformed object (for REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB bad offset, not in section for opcode at: 0x3)
-RUN: not llvm-objdump -macho -rebase %p/Inputs/macho-rebase-bad-opcode-value 2>&1 | FileCheck -check-prefix REBASE-BAD-OPCODE-VALUE %s
+RUN: not llvm-objdump --macho --rebase %p/Inputs/macho-rebase-bad-opcode-value 2>&1 | FileCheck --check-prefix REBASE-BAD-OPCODE-VALUE %s
REBASE-BAD-OPCODE-VALUE: macho-rebase-bad-opcode-value': truncated or malformed object (bad rebase info (bad opcode value 0xd0 for opcode at: 0x4)
diff --git a/llvm/test/tools/llvm-objdump/MachO/bad-ordinal.test b/llvm/test/tools/llvm-objdump/MachO/bad-ordinal.test
index fb49f77f0751..d289805842ec 100644
--- a/llvm/test/tools/llvm-objdump/MachO/bad-ordinal.test
+++ b/llvm/test/tools/llvm-objdump/MachO/bad-ordinal.test
@@ -1,4 +1,4 @@
-# RUN: not llvm-objdump -macho -lazy-bind %p/Inputs/bad-ordinal.macho-x86_64 \
+# RUN: not llvm-objdump --macho --lazy-bind %p/Inputs/bad-ordinal.macho-x86_64 \
# RUN: 2>&1 | FileCheck %s
# CHECK: bad-ordinal.macho-x86_64': truncated or malformed object (for BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB bad library ordinal: 2 (max 1) for opcode at: 0x2)
diff --git a/llvm/test/tools/llvm-objdump/MachO/bad-trie.test b/llvm/test/tools/llvm-objdump/MachO/bad-trie.test
index 9477f228aaaf..69e572c3c029 100644
--- a/llvm/test/tools/llvm-objdump/MachO/bad-trie.test
+++ b/llvm/test/tools/llvm-objdump/MachO/bad-trie.test
@@ -1,35 +1,35 @@
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-bad-kind 2>&1 | FileCheck -check-prefix BAD_KIND %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-bad-kind 2>&1 | FileCheck --check-prefix BAD_KIND %s
BAD_KIND: macho-trie-bad-kind': truncated or malformed object (unsupported exported symbol kind: 3 in flags: 0x13 in export trie data at node: 0x53)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-bad-export-info-malformed-uleb128 2>&1 | FileCheck -check-prefix MALFORMED_ULEB128 %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-bad-export-info-malformed-uleb128 2>&1 | FileCheck --check-prefix MALFORMED_ULEB128 %s
MALFORMED_ULEB128: macho-trie-bad-export-info-malformed-uleb128': truncated or malformed object (export info size malformed uleb128, extends past end in export trie data at node: 0x5a)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big 2>&1 | FileCheck -check-prefix MALFORMED_ULEB128_TOO_BIG %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big 2>&1 | FileCheck --check-prefix MALFORMED_ULEB128_TOO_BIG %s
MALFORMED_ULEB128_TOO_BIG: macho-trie-bad-export-info-malformed-uleb128_too_big': truncated or malformed object (export info size uleb128 too big for uint64 in export trie data at node: 0x5a)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-export-info-size-too-big 2>&1 | FileCheck -check-prefix EXPORT_INFO_SIZE_TOO_BIG %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-export-info-size-too-big 2>&1 | FileCheck --check-prefix EXPORT_INFO_SIZE_TOO_BIG %s
EXPORT_INFO_SIZE_TOO_BIG: macho-trie-export-info-size-too-big': truncated or malformed object (export info size: 0x1234 in export trie data at node: 0x33 too big and extends past end of trie data)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-children-count-byte 2>&1 | FileCheck -check-prefix CHILDREN_COUNT_BYTE %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-children-count-byte 2>&1 | FileCheck --check-prefix CHILDREN_COUNT_BYTE %s
CHILDREN_COUNT_BYTE: macho-trie-children-count-byte': truncated or malformed object (byte for count of childern in export trie data at node: 0x5 extends past end of trie data)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-import-name-start 2>&1 | FileCheck -check-prefix IMPORT_NAME_START %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-import-name-start 2>&1 | FileCheck --check-prefix IMPORT_NAME_START %s
IMPORT_NAME_START: macho-trie-import-name-start': truncated or malformed object (import name of re-export in export trie data at node: 0x33 starts past end of trie data)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-import-name-end 2>&1 | FileCheck -check-prefix IMPORT_NAME_END %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-import-name-end 2>&1 | FileCheck --check-prefix IMPORT_NAME_END %s
IMPORT_NAME_END: macho-trie-import-name-end': truncated or malformed object (import name of re-export in export trie data at node: 0x33 extends past end of trie data)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-edge-string-end 2>&1 | FileCheck -check-prefix EDGE_STRING_END %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-edge-string-end 2>&1 | FileCheck --check-prefix EDGE_STRING_END %s
EDGE_STRING_END: macho-trie-edge-string-end': truncated or malformed object (edge sub-string in export trie data at node: 0x42 for child #0 extends past end of trie data)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-not-export-node 2>&1 | FileCheck -check-prefix NOT_EXPORT_NODE %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-not-export-node 2>&1 | FileCheck --check-prefix NOT_EXPORT_NODE %s
NOT_EXPORT_NODE: macho-trie-not-export-node': truncated or malformed object (node is not an export node in export trie data at node: 0x5a)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-node-loop 2>&1 | FileCheck -check-prefix LOOP_OF_CHILDERN %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-node-loop 2>&1 | FileCheck --check-prefix LOOP_OF_CHILDERN %s
LOOP_OF_CHILDERN: macho-trie-node-loop': truncated or malformed object (loop in childern in export trie data at node: 0x42 back to node: 0x5)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-trie-bad-library-ordinal 2>&1 | FileCheck -check-prefix BAD_LIBRARY_ORDINAL %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-trie-bad-library-ordinal 2>&1 | FileCheck --check-prefix BAD_LIBRARY_ORDINAL %s
BAD_LIBRARY_ORDINAL: macho-trie-bad-library-ordinal': truncated or malformed object (bad library ordinal: 69 (max 3) in export trie data at node: 0x33)
-RUN: not llvm-objdump -macho -exports-trie %p/Inputs/macho-inconsistant-export 2>&1 | FileCheck -check-prefix INCONSISTANT_EXPORT_SIZE %s
+RUN: not llvm-objdump --macho --exports-trie %p/Inputs/macho-inconsistant-export 2>&1 | FileCheck --check-prefix INCONSISTANT_EXPORT_SIZE %s
INCONSISTANT_EXPORT_SIZE: macho-inconsistant-export': truncated or malformed object (inconsistant export info size: 0x9 where actual size was: 0x5 in export trie data at node: 0x53)
diff --git a/llvm/test/tools/llvm-objdump/MachO/bind.test b/llvm/test/tools/llvm-objdump/MachO/bind.test
index 5527bfa83638..3d36785f23a1 100644
--- a/llvm/test/tools/llvm-objdump/MachO/bind.test
+++ b/llvm/test/tools/llvm-objdump/MachO/bind.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -macho -bind %p/Inputs/bind.macho-x86_64 \
+# RUN: llvm-objdump --macho --bind %p/Inputs/bind.macho-x86_64 \
# RUN: | FileCheck %s
diff --git a/llvm/test/tools/llvm-objdump/MachO/bind2.test b/llvm/test/tools/llvm-objdump/MachO/bind2.test
index 2eee2fcb60b3..edf83591a249 100644
--- a/llvm/test/tools/llvm-objdump/MachO/bind2.test
+++ b/llvm/test/tools/llvm-objdump/MachO/bind2.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -macho -bind %p/Inputs/bind2.macho-x86_64 | FileCheck %s
+# RUN: llvm-objdump --macho --bind %p/Inputs/bind2.macho-x86_64 | FileCheck %s
# CHECK: __DATA __data 0x00001008 pointer 0 libSystem _malloc
# CHECK: __DATA __data 0x00001050 pointer 0 libSystem _malloc
diff --git a/llvm/test/tools/llvm-objdump/MachO/build-version.yaml b/llvm/test/tools/llvm-objdump/MachO/build-version.yaml
index ef70774b56a5..a7e7f64e4e5a 100644
--- a/llvm/test/tools/llvm-objdump/MachO/build-version.yaml
+++ b/llvm/test/tools/llvm-objdump/MachO/build-version.yaml
@@ -1,4 +1,4 @@
-# RUN: yaml2obj %s | llvm-objdump -macho -private-headers - | FileCheck %s
+# RUN: yaml2obj %s | llvm-objdump --macho --private-headers - | FileCheck %s
--- !mach-o
FileHeader:
diff --git a/llvm/test/tools/llvm-objdump/MachO/compact-unwind-i386.test b/llvm/test/tools/llvm-objdump/MachO/compact-unwind-i386.test
index 9a14c2044c01..dc65ea117205 100644
--- a/llvm/test/tools/llvm-objdump/MachO/compact-unwind-i386.test
+++ b/llvm/test/tools/llvm-objdump/MachO/compact-unwind-i386.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -unwind-info %p/Inputs/compact-unwind.macho-i386 | FileCheck %s
+# RUN: llvm-objdump --unwind-info %p/Inputs/compact-unwind.macho-i386 | FileCheck %s
# CHECK: Contents of __compact_unwind section:
# CHECK: Entry at offset 0x0:
diff --git a/llvm/test/tools/llvm-objdump/MachO/compact-unwind-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/compact-unwind-x86_64.test
index 852800d357f2..6a81f5e104f1 100644
--- a/llvm/test/tools/llvm-objdump/MachO/compact-unwind-x86_64.test
+++ b/llvm/test/tools/llvm-objdump/MachO/compact-unwind-x86_64.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -unwind-info %p/Inputs/compact-unwind.macho-x86_64 | FileCheck %s
+# RUN: llvm-objdump --unwind-info %p/Inputs/compact-unwind.macho-x86_64 | FileCheck %s
# CHECK: Contents of __compact_unwind section:
# CHECK: Entry at offset 0x0:
diff --git a/llvm/test/tools/llvm-objdump/MachO/cstring-dump.test b/llvm/test/tools/llvm-objdump/MachO/cstring-dump.test
index 9ced9c60121c..7dd9d766b197 100644
--- a/llvm/test/tools/llvm-objdump/MachO/cstring-dump.test
+++ b/llvm/test/tools/llvm-objdump/MachO/cstring-dump.test
@@ -1,7 +1,7 @@
-RUN: llvm-objdump -m -section __TEXT,__cstring %p/Inputs/hello.obj.macho-x86_64 2>&1 | FileCheck %s --implicit-check-not="warning:"
-RUN: llvm-objdump -m -section __TEXT,__cstring -no-leading-addr %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO_ADDR --implicit-check-not="warning:"
-RUN: llvm-objdump -m -section __TEXT,__cstring -no-leading-headers %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO_HEADERS --implicit-check-not="warning:"
-RUN: llvm-objdump -m -section __TEXT,__cstring -non-verbose %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NON_VERBOSE --implicit-check-not="warning:"
+RUN: llvm-objdump --macho --section __TEXT,__cstring %p/Inputs/hello.obj.macho-x86_64 2>&1 | FileCheck %s --implicit-check-not="warning:"
+RUN: llvm-objdump --macho --section __TEXT,__cstring --no-leading-addr %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=NO_ADDR --implicit-check-not="warning:"
+RUN: llvm-objdump --macho --section __TEXT,__cstring --no-leading-headers %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=NO_HEADERS --implicit-check-not="warning:"
+RUN: llvm-objdump --macho --section __TEXT,__cstring --non-verbose %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=NON_VERBOSE --implicit-check-not="warning:"
CHECK: Contents of (__TEXT,__cstring) section
CHECK-NEXT: 000000000000003b Hello world\n
diff --git a/llvm/test/tools/llvm-objdump/MachO/data-in-code.ll b/llvm/test/tools/llvm-objdump/MachO/data-in-code.ll
index 57877da09f35..de78203c98cf 100644
--- a/llvm/test/tools/llvm-objdump/MachO/data-in-code.ll
+++ b/llvm/test/tools/llvm-objdump/MachO/data-in-code.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mtriple x86_64-apple-darwin -filetype=obj -O0 %s -o %t.o
-; RUN: llvm-objdump -macho -disassemble -no-show-raw-insn %t.o | FileCheck %s
+; RUN: llc --mtriple x86_64-apple-darwin -filetype=obj -O0 %s -o %t.o
+; RUN: llvm-objdump --macho -d --no-show-raw-insn %t.o | FileCheck %s
; CHECK: .long {{[0-9]+}} @ KIND_JUMP_TABLE32
; CHECK: .long {{[0-9]+}} @ KIND_JUMP_TABLE32
diff --git a/llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test b/llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test
index df4618dc4681..57d328ea3a25 100644
--- a/llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test
+++ b/llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -m -d %p/Inputs/hello.obj.macho-x86_64 -no-show-raw-insn -print-imm-hex -no-leading-addr | FileCheck %s
+# RUN: llvm-objdump --macho -d %p/Inputs/hello.obj.macho-x86_64 --no-show-raw-insn --print-imm-hex --no-leading-addr | FileCheck %s
# CHECK: (__TEXT,__text) section
# CHECK: _main:
diff --git a/llvm/test/tools/llvm-objdump/MachO/dis-symname.test b/llvm/test/tools/llvm-objdump/MachO/dis-symname.test
index 9e4f2e3c71f2..9c7a341e33b8 100644
--- a/llvm/test/tools/llvm-objdump/MachO/dis-symname.test
+++ b/llvm/test/tools/llvm-objdump/MachO/dis-symname.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -m -d %p/Inputs/exeThread.macho-x86_64 -dis-symname start -no-show-raw-insn -full-leading-addr -print-imm-hex | FileCheck %s
+# RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname start --no-show-raw-insn --full-leading-addr --print-imm-hex | FileCheck %s
# CHECK: (__TEXT,__text) section
# CHECK: start:
@@ -18,8 +18,8 @@
# CHECK-NOT: 0000000100000d22
# CHECK-NOT: _main:
-# not RUN: llvm-objdump -m -d %p/Inputs/exeThread.macho-x86_64 -dis-symname _environ 2>&1 | FileCheck -check-prefix BAD-SYMAME-1 %s
+# not RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname _environ 2>&1 | FileCheck --check-prefix BAD-SYMAME-1 %s
BAD-SYMAME-1: -dis-symname: _environ not in the section
-# not RUN: llvm-objdump -m -d %p/Inputs/exeThread.macho-x86_64 -dis-symname __mh_execute_header 2>&1 | FileCheck -check-prefix BAD-SYMAME-2 %s
+# not RUN: llvm-objdump --macho -d %p/Inputs/exeThread.macho-x86_64 --dis-symname __mh_execute_header 2>&1 | FileCheck --check-prefix BAD-SYMAME-2 %s
BAD-SYMAME-2: -dis-symname: __mh_execute_header not in any section
diff --git a/llvm/test/tools/llvm-objdump/MachO/disassemble-all.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-all.test
index ce22d740087d..05d4a5d9ca9e 100644
--- a/llvm/test/tools/llvm-objdump/MachO/disassemble-all.test
+++ b/llvm/test/tools/llvm-objdump/MachO/disassemble-all.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -m -d -full-leading-addr -print-imm-hex -no-show-raw-insn %p/Inputs/macho-multiple-text | FileCheck %s -check-prefix=TEXT
+// RUN: llvm-objdump --macho -d --full-leading-addr --print-imm-hex --no-show-raw-insn %p/Inputs/macho-multiple-text | FileCheck %s --check-prefix=TEXT
TEXT: (__TEXT,__text) section
TEXT_NEXT: _main:
@@ -12,7 +12,7 @@ TEXT_NEXT: 0000000100000f76 addq $0x10, %rsp
TEXT_NEXT: 0000000100000f7a popq %rbp
TEXT_NEXT: 0000000100000f7b retq
-// RUN: llvm-objdump -m -D -full-leading-addr -print-imm-hex -no-show-raw-insn %p/Inputs/macho-multiple-text | FileCheck %s -check-prefix=ALL
+// RUN: llvm-objdump --macho -D --full-leading-addr --print-imm-hex --no-show-raw-insn %p/Inputs/macho-multiple-text | FileCheck %s --check-prefix=ALL
ALL: (__TEXT,__text) section
ALL_NEXT: _main:
diff --git a/llvm/test/tools/llvm-objdump/MachO/disassemble-g-dsym.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-g-dsym.test
index 94ef98ab9f68..3e4faf7c6162 100644
--- a/llvm/test/tools/llvm-objdump/MachO/disassemble-g-dsym.test
+++ b/llvm/test/tools/llvm-objdump/MachO/disassemble-g-dsym.test
@@ -1,17 +1,17 @@
// RUN: dsymutil -f -oso-prepend-path=%p/../../dsymutil/ %p/../../dsymutil/Inputs/basic.macho.x86_64 -o %t1.dSYM
-// RUN: llvm-objdump -d -g -dsym=%t1.dSYM %p/../../dsymutil/Inputs/basic.macho.x86_64 >%t0
-// RUN: llvm-objdump -dg -dsym=%t1.dSYM %p/../../dsymutil/Inputs/basic.macho.x86_64 >%t1
+// RUN: llvm-objdump -d -g --dsym=%t1.dSYM %p/../../dsymutil/Inputs/basic.macho.x86_64 >%t0
+// RUN: llvm-objdump --dg --dsym=%t1.dSYM %p/../../dsymutil/Inputs/basic.macho.x86_64 >%t1
// RUN: cmp %t0 %t1
// RUN: FileCheck --input-file %t0 %s
CHECK: Disassembly of section __TEXT,__text:
-// RUN: llvm-objdump -m -d -g -dsym %p/Inputs/hello-macho-fat.dwarf %p/Inputs/hello-macho-fat | FileCheck -check-prefix MACHO_DSYM %s
-// RUN: llvm-objdump -m -d -g -dsym %p/Inputs/hello-macho-fat.dwarf %p/Inputs/hello-macho-thin | FileCheck -check-prefix MACHO_DSYM %s
-// RUN: llvm-objdump -m -d -g -dsym %p/Inputs/hello-macho-thin.dwarf %p/Inputs/hello-macho-thin | FileCheck -check-prefix MACHO_DSYM %s
+// RUN: llvm-objdump --macho -d -g --dsym %p/Inputs/hello-macho-fat.dwarf %p/Inputs/hello-macho-fat | FileCheck --check-prefix MACHO_DSYM %s
+// RUN: llvm-objdump --macho -d -g --dsym %p/Inputs/hello-macho-fat.dwarf %p/Inputs/hello-macho-thin | FileCheck --check-prefix MACHO_DSYM %s
+// RUN: llvm-objdump --macho -d -g --dsym %p/Inputs/hello-macho-thin.dwarf %p/Inputs/hello-macho-thin | FileCheck --check-prefix MACHO_DSYM %s
MACHO_DSYM: (__TEXT,__text) section
-// RUN: llvm-objdump -m -d -g -dsym %p/../Inputs/libbogus11.a %p/../../dsymutil/Inputs/basic.macho.x86_64 2>&1 | FileCheck -check-prefix BAD_INPUT %s
+// RUN: llvm-objdump --macho -d -g --dsym %p/../Inputs/libbogus11.a %p/../../dsymutil/Inputs/basic.macho.x86_64 2>&1 | FileCheck --check-prefix BAD_INPUT %s
BAD_INPUT: is not a Mach-O or Universal file type.
diff --git a/llvm/test/tools/llvm-objdump/MachO/disassemble-kextbundle.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-kextbundle.test
index b6c53a22f0c2..024cfdf62b01 100644
--- a/llvm/test/tools/llvm-objdump/MachO/disassemble-kextbundle.test
+++ b/llvm/test/tools/llvm-objdump/MachO/disassemble-kextbundle.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/kextbundle.macho-x86_64 | FileCheck %s
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/kextbundle.macho-x86_64 | FileCheck %s
CHECK: (__TEXT,__text) section
CHECK: _foo:
diff --git a/llvm/test/tools/llvm-objdump/MachO/disassemble-stab.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-stab.test
index 050b350e447f..bd9b04cf0099 100644
--- a/llvm/test/tools/llvm-objdump/MachO/disassemble-stab.test
+++ b/llvm/test/tools/llvm-objdump/MachO/disassemble-stab.test
@@ -1,3 +1,3 @@
-# RUN: llvm-objdump -m -disassemble %p/Inputs/macho-disassemble-stab-x86_64 | FileCheck %s
+# RUN: llvm-objdump --macho -d %p/Inputs/macho-disassemble-stab-x86_64 | FileCheck %s
CHECK: (__TEXT,__text) section
diff --git a/llvm/test/tools/llvm-objdump/MachO/disassemble-stripped.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-stripped.test
index fab86f8b9794..ec7715c94990 100644
--- a/llvm/test/tools/llvm-objdump/MachO/disassemble-stripped.test
+++ b/llvm/test/tools/llvm-objdump/MachO/disassemble-stripped.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.stripped.macho-x86_64 | FileCheck %s
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.exe.stripped.macho-x86_64 | FileCheck %s
CHECK: (__TEXT,__text) section
CHECK: 0000000100000f30 pushq %rbp
diff --git a/llvm/test/tools/llvm-objdump/MachO/dylib.test b/llvm/test/tools/llvm-objdump/MachO/dylib.test
index 7454de013d03..32c64f019c47 100644
--- a/llvm/test/tools/llvm-objdump/MachO/dylib.test
+++ b/llvm/test/tools/llvm-objdump/MachO/dylib.test
@@ -1,13 +1,13 @@
-RUN: llvm-objdump -m -dylibs-used %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=USED
+RUN: llvm-objdump --macho --dylibs-used %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=USED
USED: /usr/lib/foo1.dylib (compatibility version 0.0.0, current version 0.0.0)
USED: /usr/lib/foo2.dylib (compatibility version 0.0.0, current version 0.0.0, weak)
USED: /usr/lib/foo3.dylib (compatibility version 0.0.0, current version 0.0.0, reexport)
USED: /usr/lib/foo4.dylib (compatibility version 0.0.0, current version 0.0.0, lazy)
USED: /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1)
-RUN: llvm-objdump -m -dylib-id %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=ID
+RUN: llvm-objdump --macho --dylib-id %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=ID
ID: /usr/lib/foo.dylib
-RUN: llvm-objdump -m -dylib-id -no-leading-headers %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s -check-prefix=IDNOHEADERS
+RUN: llvm-objdump --macho --dylib-id --no-leading-headers %p/Inputs/dylibLoadKinds.macho-x86_64 | FileCheck %s --check-prefix=IDNOHEADERS
IDNOHEADERS-NOT: dylibLoadKinds.macho-x86_64:
IDNOHEADERS: /usr/lib/foo.dylib
diff --git a/llvm/test/tools/llvm-objdump/MachO/eh_frame-arm64.test b/llvm/test/tools/llvm-objdump/MachO/eh_frame-arm64.test
index c04de089f9b0..1768d019597a 100644
--- a/llvm/test/tools/llvm-objdump/MachO/eh_frame-arm64.test
+++ b/llvm/test/tools/llvm-objdump/MachO/eh_frame-arm64.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -dwarf=frames %p/Inputs/eh_frame.macho-arm64 2>/dev/null | FileCheck %s
+# RUN: llvm-objdump --dwarf=frames %p/Inputs/eh_frame.macho-arm64 2>/dev/null | FileCheck %s
# CHECK: .eh_frame contents:
diff --git a/llvm/test/tools/llvm-objdump/MachO/exports-trie.test b/llvm/test/tools/llvm-objdump/MachO/exports-trie.test
index 3b081f5f975f..20d3d04517be 100644
--- a/llvm/test/tools/llvm-objdump/MachO/exports-trie.test
+++ b/llvm/test/tools/llvm-objdump/MachO/exports-trie.test
@@ -1,6 +1,6 @@
-# RUN: llvm-objdump -macho -exports-trie -arch x86_64 \
+# RUN: llvm-objdump --macho --exports-trie --arch x86_64 \
# RUN: %p/Inputs/exports-trie.macho-x86_64 2>/dev/null | FileCheck %s
-# RUN: llvm-objdump -macho -exports-trie -arch x86_64 \
+# RUN: llvm-objdump --macho --exports-trie --arch x86_64 \
# RUN: %p/Inputs/weak-bind.macho-x86_64 2>/dev/null | FileCheck --check-prefix=EXE %s
diff --git a/llvm/test/tools/llvm-objdump/MachO/image-info.test b/llvm/test/tools/llvm-objdump/MachO/image-info.test
index dbb864f84dcc..688393e2f053 100644
--- a/llvm/test/tools/llvm-objdump/MachO/image-info.test
+++ b/llvm/test/tools/llvm-objdump/MachO/image-info.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple x86_64-darwin -filetype=obj | llvm-objdump -m -objc-meta-data - | FileCheck %s
+# RUN: llvm-mc < %s --triple x86_64-darwin -filetype=obj | llvm-objdump --macho --objc-meta-data - | FileCheck %s
.section __DATA,__objc_imageinfo,regular,no_dead_strip
.long 0
diff --git a/llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test b/llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test
index fdc465ad5425..dcdb068e711f 100644
--- a/llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test
+++ b/llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test
@@ -1,5 +1,5 @@
-RUN: llvm-objdump -macho -indirect-symbols %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s
-RUN: llvm-objdump -macho -indirect-symbols -non-verbose %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=NON_VERBOSE
+RUN: llvm-objdump --macho --indirect-symbols %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho --indirect-symbols --non-verbose %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=NON_VERBOSE
CHECK: Indirect symbols for (__TEXT,__stubs) 1 entries
CHECK: address index name
diff --git a/llvm/test/tools/llvm-objdump/MachO/info-plist-nofollow.test b/llvm/test/tools/llvm-objdump/MachO/info-plist-nofollow.test
index 12ad166c5a2f..db9704c8c54e 100644
--- a/llvm/test/tools/llvm-objdump/MachO/info-plist-nofollow.test
+++ b/llvm/test/tools/llvm-objdump/MachO/info-plist-nofollow.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -info-plist - | FileCheck %s
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --info-plist - | FileCheck %s
.section __TEXT, __info_plist
.ascii "This is the (__TEXT,__info_plist) section\n"
diff --git a/llvm/test/tools/llvm-objdump/MachO/info-plist.test b/llvm/test/tools/llvm-objdump/MachO/info-plist.test
index 7550af905b7e..8370b6b3e392 100644
--- a/llvm/test/tools/llvm-objdump/MachO/info-plist.test
+++ b/llvm/test/tools/llvm-objdump/MachO/info-plist.test
@@ -1,5 +1,5 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -info-plist - | FileCheck %s
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -info-plist -no-leading-headers - | FileCheck --check-prefix=NOHEADER %s
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --info-plist - | FileCheck %s
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --info-plist --no-leading-headers - | FileCheck --check-prefix=NOHEADER %s
.section __TEXT, __info_plist
.asciz "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
diff --git a/llvm/test/tools/llvm-objdump/MachO/lazy-bind.test b/llvm/test/tools/llvm-objdump/MachO/lazy-bind.test
index 088ea0641f0b..d16d2a80f325 100644
--- a/llvm/test/tools/llvm-objdump/MachO/lazy-bind.test
+++ b/llvm/test/tools/llvm-objdump/MachO/lazy-bind.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -macho -lazy-bind %p/Inputs/lazy-bind.macho-x86_64 \
+# RUN: llvm-objdump --macho --lazy-bind %p/Inputs/lazy-bind.macho-x86_64 \
# RUN: | FileCheck %s
diff --git a/llvm/test/tools/llvm-objdump/MachO/literal-pointers-i386.test b/llvm/test/tools/llvm-objdump/MachO/literal-pointers-i386.test
index 62ed607c8ee5..adced92a020e 100644
--- a/llvm/test/tools/llvm-objdump/MachO/literal-pointers-i386.test
+++ b/llvm/test/tools/llvm-objdump/MachO/literal-pointers-i386.test
@@ -1,5 +1,5 @@
-# RUN: llvm-mc < %s -triple i386-apple-darwin -filetype=obj | llvm-objdump -m -section __DATA,__litp - | FileCheck %s
-# RUN: llvm-mc < %s -triple i386-apple-darwin -filetype=obj | llvm-objdump -m -section __DATA,__litp -non-verbose - | FileCheck %s -check-prefix=NON-VERBOSE
+# RUN: llvm-mc < %s --triple i386-apple-darwin -filetype=obj | llvm-objdump --macho --section __DATA,__litp - | FileCheck %s
+# RUN: llvm-mc < %s --triple i386-apple-darwin -filetype=obj | llvm-objdump --macho --section __DATA,__litp --non-verbose - | FileCheck %s --check-prefix=NON-VERBOSE
.cstring
L1: .asciz "Hello world\n"
diff --git a/llvm/test/tools/llvm-objdump/MachO/literal-pointers-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/literal-pointers-x86_64.test
index f1912e8861cb..d123b97d12eb 100644
--- a/llvm/test/tools/llvm-objdump/MachO/literal-pointers-x86_64.test
+++ b/llvm/test/tools/llvm-objdump/MachO/literal-pointers-x86_64.test
@@ -1,5 +1,5 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __DATA,__litp - | FileCheck %s
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __DATA,__litp -non-verbose - | FileCheck %s -check-prefix=NON-VERBOSE
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __DATA,__litp - | FileCheck %s
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __DATA,__litp --non-verbose - | FileCheck %s --check-prefix=NON-VERBOSE
.cstring
L1: .asciz "Hello world\n"
diff --git a/llvm/test/tools/llvm-objdump/MachO/literals.test b/llvm/test/tools/llvm-objdump/MachO/literals.test
index d93ae679f348..6d622e0ab93f 100644
--- a/llvm/test/tools/llvm-objdump/MachO/literals.test
+++ b/llvm/test/tools/llvm-objdump/MachO/literals.test
@@ -1,9 +1,9 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __TEXT,__literal4 - | FileCheck %s -check-prefix=CHECK-LIT4
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __TEXT,__literal4 -non-verbose - | FileCheck %s -check-prefix=NON-VERBOSE-LIT4
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __TEXT,__literal8 - | FileCheck %s -check-prefix=CHECK-LIT8
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __TEXT,__literal8 -non-verbose - | FileCheck %s -check-prefix=NON-VERBOSE-LIT8
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __TEXT,__literal16 - | FileCheck %s -check-prefix=CHECK-LIT16
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __TEXT,__literal16 -non-verbose - | FileCheck %s -check-prefix=NON-VERBOSE-LIT16
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __TEXT,__literal4 - | FileCheck %s --check-prefix=CHECK-LIT4
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __TEXT,__literal4 --non-verbose - | FileCheck %s --check-prefix=NON-VERBOSE-LIT4
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __TEXT,__literal8 - | FileCheck %s --check-prefix=CHECK-LIT8
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __TEXT,__literal8 --non-verbose - | FileCheck %s --check-prefix=NON-VERBOSE-LIT8
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __TEXT,__literal16 - | FileCheck %s --check-prefix=CHECK-LIT16
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __TEXT,__literal16 --non-verbose - | FileCheck %s --check-prefix=NON-VERBOSE-LIT16
.literal4
.float 2.5
diff --git a/llvm/test/tools/llvm-objdump/MachO/maccatalyst-build-version.yaml b/llvm/test/tools/llvm-objdump/MachO/maccatalyst-build-version.yaml
index b143aea31fab..8ff27a89b14e 100644
--- a/llvm/test/tools/llvm-objdump/MachO/maccatalyst-build-version.yaml
+++ b/llvm/test/tools/llvm-objdump/MachO/maccatalyst-build-version.yaml
@@ -1,4 +1,4 @@
-# RUN: yaml2obj %s | llvm-objdump -macho -private-headers - | FileCheck %s
+# RUN: yaml2obj %s | llvm-objdump --macho --private-headers - | FileCheck %s
--- !mach-o
FileHeader:
diff --git a/llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test b/llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test
index 0c38a649c5ae..566bde6f4581 100644
--- a/llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test
+++ b/llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test
@@ -1,11 +1,11 @@
-# RUN: llvm-objdump -m -objc-meta-data %p/Inputs/Objc2.64bit.exe.macho-x86_64 | FileCheck %s -check-prefix=OBJC2_64BIT_EXE
-# RUN: llvm-objdump -m -objc-meta-data %p/Inputs/Objc2.64bit.obj.macho-x86_64 | FileCheck %s -check-prefix=OBJC2_64BIT_OBJ
-# RUN: llvm-objdump -m -objc-meta-data %p/Inputs/Objc2.32bit.exe.macho-i386 | FileCheck %s -check-prefix=OBJC2_32BIT_EXE
-# RUN: llvm-objdump -m -objc-meta-data %p/Inputs/Objc2.32bit.obj.macho-i386 | FileCheck %s -check-prefix=OBJC2_32BIT_OBJ
-# RUN: llvm-objdump -m -objc-meta-data %p/Inputs/Objc1.32bit.exe.macho-i386 | FileCheck %s -check-prefix=OBJC1_32BIT_EXE
-# RUN: llvm-objdump -m -objc-meta-data %p/Inputs/Objc1.32bit.obj.macho-i386 | FileCheck %s -check-prefix=OBJC1_32BIT_OBJ
-# RUN: llvm-objdump -m -section __OBJC,__protocol %p/Inputs/Objc1.32bit.exe.macho-i386 | FileCheck %s -check-prefix=PROTOCOL
-# RUN: llvm-objdump -m -objc-meta-data %p/Inputs/Objc2.64bit.obj.dylib-x86_64 | FileCheck %s -check-prefix=OBJC2_64BIT_DYLIB
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.64bit.exe.macho-x86_64 | FileCheck %s --check-prefix=OBJC2_64BIT_EXE
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.64bit.obj.macho-x86_64 | FileCheck %s --check-prefix=OBJC2_64BIT_OBJ
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.32bit.exe.macho-i386 | FileCheck %s --check-prefix=OBJC2_32BIT_EXE
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.32bit.obj.macho-i386 | FileCheck %s --check-prefix=OBJC2_32BIT_OBJ
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc1.32bit.exe.macho-i386 | FileCheck %s --check-prefix=OBJC1_32BIT_EXE
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc1.32bit.obj.macho-i386 | FileCheck %s --check-prefix=OBJC1_32BIT_OBJ
+# RUN: llvm-objdump --macho --section __OBJC,__protocol %p/Inputs/Objc1.32bit.exe.macho-i386 | FileCheck %s --check-prefix=PROTOCOL
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/Objc2.64bit.obj.dylib-x86_64 | FileCheck %s --check-prefix=OBJC2_64BIT_DYLIB
OBJC2_64BIT_EXE: Contents of (__DATA,__objc_classlist) section
OBJC2_64BIT_EXE: 0000000100002028 0x1000029f0
diff --git a/llvm/test/tools/llvm-objdump/MachO/malformed-machos.test b/llvm/test/tools/llvm-objdump/MachO/malformed-machos.test
index ecf39866a95b..c64f8bf9f9e3 100644
--- a/llvm/test/tools/llvm-objdump/MachO/malformed-machos.test
+++ b/llvm/test/tools/llvm-objdump/MachO/malformed-machos.test
@@ -1,74 +1,74 @@
// These test checks that llvm-objdump will not crash with malformed Mach-O
// files. So the check line is not all that important but the bug fixes to
// make sure llvm-objdump is robust is what matters.
-# RUN: not llvm-objdump -macho -objc-meta-data \
+# RUN: not llvm-objdump --macho --objc-meta-data \
# RUN: %p/Inputs/malformed-machos/mem-crup-0001.macho 2>&1 \
# RUN: | FileCheck -check-prefix=m0001 %s
# m0001: mem-crup-0001.macho': truncated or malformed object (addr field plus size of section 2 in LC_SEGMENT_64 command 0 greater than than the segment's vmaddr plus vmsize)
-# RUN: not llvm-objdump -macho -objc-meta-data \
+# RUN: not llvm-objdump --macho --objc-meta-data \
# RUN: %p/Inputs/malformed-machos/mem-crup-0006.macho 2>&1 \
# RUN: | FileCheck -check-prefix=m0006 %s
# m0006: malformed-machos/mem-crup-0006.macho': truncated or malformed object (section contents at offset 4128 with a size of 176, overlaps section contents at offset 4128 with a size of 8)
-# RUN: not llvm-objdump -macho -objc-meta-data \
+# RUN: not llvm-objdump --macho --objc-meta-data \
# RUN: %p/Inputs/malformed-machos/mem-crup-0010.macho 2>&1 \
# RUN: | FileCheck -check-prefix=m0010 %s
# m0010: mem-crup-0010.macho': truncated or malformed object (section contents at offset 4320 with a size of 80, overlaps section contents at offset 4320 with a size of 8)
-# RUN: not llvm-objdump -macho -objc-meta-data \
+# RUN: not llvm-objdump --macho --objc-meta-data \
# RUN: %p/Inputs/malformed-machos/mem-crup-0040.macho 2>&1 \
# RUN: | FileCheck -check-prefix=m0040 %s
# m0040: mem-crup-0040.macho': truncated or malformed object (offset field plus size field of section 2 in LC_SEGMENT_64 command 1 extends past the end of the file)
-# RUN: not llvm-objdump -macho -objc-meta-data \
+# RUN: not llvm-objdump --macho --objc-meta-data \
# RUN: %p/Inputs/malformed-machos/mem-crup-0080.macho 2>&1 \
# RUN: | FileCheck -check-prefix=m0080 %s
# m0080: mem-crup-0080.macho': truncated or malformed object (addr field plus size of section 2 in LC_SEGMENT_64 command 1 greater than than the segment's vmaddr plus vmsize)
-# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN: llvm-objdump --macho --objc-meta-data \
# RUN: %p/Inputs/malformed-machos/mem-crup-0261.macho
-# RUN: not llvm-objdump -macho -disassemble \
+# RUN: not llvm-objdump --macho -d \
# RUN: %p/Inputs/malformed-machos/mem-crup-0337.macho 2>&1 \
# RUN: | FileCheck -check-prefix=m0337 %s
# m0337: mem-crup-0337.macho': truncated or malformed object (section relocation entries at offset 0 with a size of 512, overlaps Mach-O headers at offset 0 with a size of 2048)
-RUN: not llvm-objdump -macho -disassemble %p/Inputs/macho-invalid-symbol-nsect 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-NSECT %s
+RUN: not llvm-objdump --macho -d %p/Inputs/macho-invalid-symbol-nsect 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-NSECT %s
INVALID-SYMBOL-NSECT: macho-invalid-symbol-nsect': truncated or malformed object (bad section index: 97 for symbol at index 1)
-RUN: not llvm-objdump -macho -disassemble %p/Inputs/macho-invalid-symbol-nsect-archive 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-NSECT-ARCHIVE %s
+RUN: not llvm-objdump --macho -d %p/Inputs/macho-invalid-symbol-nsect-archive 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-NSECT-ARCHIVE %s
INVALID-SYMBOL-NSECT-ARCHIVE: macho-invalid-symbol-nsect-archive(macho-invalid-symbol-nsect): truncated or malformed object (bad section index: 97 for symbol at index 1)
-RUN: not llvm-objdump -macho -disassemble %p/Inputs/macho-invalid-symbol-indr 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-INDR %s
+RUN: not llvm-objdump --macho -d %p/Inputs/macho-invalid-symbol-indr 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-INDR %s
INVALID-SYMBOL-INDR: macho-invalid-symbol-indr': truncated or malformed object (bad n_value: 22 past the end of string table, for N_INDR symbol at index 1)
-RUN: not llvm-objdump -macho -disassemble -arch all %p/Inputs/macho-invalid-symbol-indr-archive-universal 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-INDR-ARCHIVE-UNIVERSAL %s
+RUN: not llvm-objdump --macho -d --arch all %p/Inputs/macho-invalid-symbol-indr-archive-universal 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-INDR-ARCHIVE-UNIVERSAL %s
INVALID-SYMBOL-INDR-ARCHIVE-UNIVERSAL: macho-invalid-symbol-indr-archive-universal(macho-invalid-symbol-indr) (for architecture i386): truncated or malformed object (bad n_value: 22 past the end of string table, for N_INDR symbol at index 1)
-RUN: not llvm-objdump -macho -disassemble %p/Inputs/macho-invalid-symbol-strx 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-STRX %s
+RUN: not llvm-objdump --macho -d %p/Inputs/macho-invalid-symbol-strx 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-STRX %s
INVALID-SYMBOL-STRX: macho-invalid-symbol-strx': truncated or malformed object (bad string table index: 22 past the end of string table, for symbol at index 1)
-RUN: not llvm-objdump -disassemble %p/Inputs/macho-invalid-symbol-strx 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-STRX-NO-MACHO-FLAG %s
+RUN: not llvm-objdump -d %p/Inputs/macho-invalid-symbol-strx 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-STRX-NO-MACHO-FLAG %s
INVALID-SYMBOL-STRX-NO-MACHO-FLAG: macho-invalid-symbol-strx': truncated or malformed object (bad string index: 22 for symbol at index 1)
-RUN: not llvm-objdump -macho -disassemble -arch all %p/Inputs/macho-invalid-symbol-strx-universal 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-STRX-UNIVERSAL %s
+RUN: not llvm-objdump --macho -d --arch all %p/Inputs/macho-invalid-symbol-strx-universal 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-STRX-UNIVERSAL %s
INVALID-SYMBOL-STRX-UNIVERSAL: macho-invalid-symbol-strx-universal' (for architecture i386): truncated or malformed object (bad string table index: 22 past the end of string table, for symbol at index 1)
-RUN: not llvm-objdump -macho -disassemble %p/Inputs/macho-invalid-symbol-lib_ordinal 2>&1 | FileCheck -check-prefix INVALID-SYMBOL-LIB_ORDINAL %s
+RUN: not llvm-objdump --macho -d %p/Inputs/macho-invalid-symbol-lib_ordinal 2>&1 | FileCheck --check-prefix INVALID-SYMBOL-LIB_ORDINAL %s
INVALID-SYMBOL-LIB_ORDINAL: macho-invalid-symbol-lib_ordinal': truncated or malformed object (bad library ordinal: 7 for symbol at index 2)
-RUN: not llvm-objdump -macho -objc-meta-data %p/Inputs/macho-invalid-bind-entry 2>&1 | FileCheck -check-prefix INVALID-BIND-ENTRY %s
+RUN: not llvm-objdump --macho --objc-meta-data %p/Inputs/macho-invalid-bind-entry 2>&1 | FileCheck --check-prefix INVALID-BIND-ENTRY %s
INVALID-BIND-ENTRY: macho-invalid-bind-entry': truncated or malformed object (for BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB bad library ordinal: 83 (max 0) for opcode at: 0x0)
-RUN: llvm-objdump -macho -r -arch x86_64 %p/Inputs/macho-invalid-reloc-section-index 2>&1 | FileCheck -check-prefix INVALID-RELOC-SECTION-INDEX %s
+RUN: llvm-objdump --macho -r --arch x86_64 %p/Inputs/macho-invalid-reloc-section-index 2>&1 | FileCheck --check-prefix INVALID-RELOC-SECTION-INDEX %s
INVALID-RELOC-SECTION-INDEX: 00000021 False byte False UNSIGND False 8388613 (?,?)
-RUN: not llvm-objdump -bind -g -macho -r -rebase -s -section-headers -t -unwind-info %p/Inputs/macho-invalid-linker-command 2>&1 | FileCheck -check-prefix INVALID-LINKCMD %s
+RUN: not llvm-objdump --bind -g --macho -r --rebase -s --section-headers -t --unwind-info %p/Inputs/macho-invalid-linker-command 2>&1 | FileCheck --check-prefix INVALID-LINKCMD %s
INVALID-LINKCMD: truncated or malformed object (load command 4 LC_LINKER_OPTION string #2 is not NULL terminated)
diff --git a/llvm/test/tools/llvm-objdump/MachO/malformed-unwind-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/malformed-unwind-x86_64.test
index 26984a3485ec..b3db5378c074 100644
--- a/llvm/test/tools/llvm-objdump/MachO/malformed-unwind-x86_64.test
+++ b/llvm/test/tools/llvm-objdump/MachO/malformed-unwind-x86_64.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -unwind-info %p/Inputs/malformed-unwind.macho-x86_64 | FileCheck %s
+# RUN: llvm-objdump --unwind-info %p/Inputs/malformed-unwind.macho-x86_64 | FileCheck %s
# CHECK: Contents of __unwind_info section:
# [...]
diff --git a/llvm/test/tools/llvm-objdump/MachO/malformed.test b/llvm/test/tools/llvm-objdump/MachO/malformed.test
index 924d58a1df24..31d68b83537e 100644
--- a/llvm/test/tools/llvm-objdump/MachO/malformed.test
+++ b/llvm/test/tools/llvm-objdump/MachO/malformed.test
@@ -1,3 +1,3 @@
-RUN: llvm-objdump -macho -private-header %p/Inputs/malformed-macho.bin %p/Inputs/empty.macho-armv7 2>&1 | FileCheck %s -check-prefix=MALFORMED
+RUN: llvm-objdump --macho --private-header %p/Inputs/malformed-macho.bin %p/Inputs/empty.macho-armv7 2>&1 | FileCheck %s --check-prefix=MALFORMED
MALFORMED: is not an object file
MALFORMED-NEXT: Mach header
diff --git a/llvm/test/tools/llvm-objdump/MachO/nofirst-symbol-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/nofirst-symbol-disassembly.test
index 98964ac8047a..a5e8b7487afd 100644
--- a/llvm/test/tools/llvm-objdump/MachO/nofirst-symbol-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/MachO/nofirst-symbol-disassembly.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -d -m %p/Inputs/nofirst-symbol.macho-x86_64 | FileCheck %s
+// RUN: llvm-objdump -d --macho %p/Inputs/nofirst-symbol.macho-x86_64 | FileCheck %s
CHECK: 0: 90 nop
CHECK: _foo:
diff --git a/llvm/test/tools/llvm-objdump/MachO/nontext-disasm.test b/llvm/test/tools/llvm-objdump/MachO/nontext-disasm.test
index 27b7bb441520..75ef3afe15f9 100644
--- a/llvm/test/tools/llvm-objdump/MachO/nontext-disasm.test
+++ b/llvm/test/tools/llvm-objdump/MachO/nontext-disasm.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -section __FOO,__bar -full-leading-addr -print-imm-hex -no-show-raw-insn - | FileCheck %s
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho --section __FOO,__bar --full-leading-addr --print-imm-hex --no-show-raw-insn - | FileCheck %s
.section __FOO, __bar
_foo:
diff --git a/llvm/test/tools/llvm-objdump/MachO/objc-meta-data.test b/llvm/test/tools/llvm-objdump/MachO/objc-meta-data.test
index e659e7e57711..a91569adda2f 100644
--- a/llvm/test/tools/llvm-objdump/MachO/objc-meta-data.test
+++ b/llvm/test/tools/llvm-objdump/MachO/objc-meta-data.test
@@ -1,3 +1,3 @@
-# RUN: llvm-objdump -macho -objc-meta-data %p/Inputs/empty.macho-armv7 | FileCheck %s
+# RUN: llvm-objdump --macho --objc-meta-data %p/Inputs/empty.macho-armv7 | FileCheck %s
# CHECK: empty.macho-armv7:
diff --git a/llvm/test/tools/llvm-objdump/MachO/preload-relocations.test b/llvm/test/tools/llvm-objdump/MachO/preload-relocations.test
index dda0b2b465bb..ed4b82b196ff 100644
--- a/llvm/test/tools/llvm-objdump/MachO/preload-relocations.test
+++ b/llvm/test/tools/llvm-objdump/MachO/preload-relocations.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -macho -r %p/Inputs/macho-preload-x86_64 | FileCheck %s
+// RUN: llvm-objdump --macho -r %p/Inputs/macho-preload-x86_64 | FileCheck %s
CHECK: Local relocation information 1 entries
CHECK: address pcrel length extern type scattered symbolnum/value
diff --git a/llvm/test/tools/llvm-objdump/MachO/print-thread.test b/llvm/test/tools/llvm-objdump/MachO/print-thread.test
index 12f71de1db2f..982eb1e9cfea 100644
--- a/llvm/test/tools/llvm-objdump/MachO/print-thread.test
+++ b/llvm/test/tools/llvm-objdump/MachO/print-thread.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -private-headers %p/Inputs/thread.macho-i386 | FileCheck %s
+RUN: llvm-objdump --macho --private-headers %p/Inputs/thread.macho-i386 | FileCheck %s
CHECK: Load command 9
CHECK: cmd LC_UNIXTHREAD
diff --git a/llvm/test/tools/llvm-objdump/MachO/private-header.test b/llvm/test/tools/llvm-objdump/MachO/private-header.test
index b904bbcf5ec0..a416fefd8c82 100644
--- a/llvm/test/tools/llvm-objdump/MachO/private-header.test
+++ b/llvm/test/tools/llvm-objdump/MachO/private-header.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -macho -private-header %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+// RUN: llvm-objdump --macho --private-header %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: Mach header
CHECK: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags
diff --git a/llvm/test/tools/llvm-objdump/MachO/private-headers.test b/llvm/test/tools/llvm-objdump/MachO/private-headers.test
index b8642fcf6e05..8ca13a383c79 100644
--- a/llvm/test/tools/llvm-objdump/MachO/private-headers.test
+++ b/llvm/test/tools/llvm-objdump/MachO/private-headers.test
@@ -17,11 +17,11 @@
// RUN: | FileCheck %s -check-prefix=ROUTINE
// RUN: llvm-objdump -p %p/Inputs/exeThread.macho-x86_64 \
// RUN: | FileCheck %s -check-prefix=THREAD
-// RUN: llvm-objdump -macho -p -arch i386 %p/Inputs/macho-universal.x86_64.i386 \
+// RUN: llvm-objdump --macho -p --arch i386 %p/Inputs/macho-universal.x86_64.i386 \
// RUN: | FileCheck %s -check-prefix=FATi386
-// RUN: llvm-objdump -p -arch i386 %p/Inputs/macho-universal.x86_64.i386 \
+// RUN: llvm-objdump -p --arch i386 %p/Inputs/macho-universal.x86_64.i386 \
// RUN: | FileCheck %s -check-prefix=FATi386
-// RUN: llvm-objdump -p -non-verbose %p/Inputs/hello.obj.macho-x86_64 \
+// RUN: llvm-objdump -p --non-verbose %p/Inputs/hello.obj.macho-x86_64 \
// RUN: | FileCheck %s -check-prefix=NON_VERBOSE
// RUN: llvm-objdump -p %p/Inputs/codesig.macho-x86_64 \
// RUN: | FileCheck %s -check-prefix=CODESIG
diff --git a/llvm/test/tools/llvm-objdump/MachO/rebase.test b/llvm/test/tools/llvm-objdump/MachO/rebase.test
index 96df39058959..0283a9dbdf3f 100644
--- a/llvm/test/tools/llvm-objdump/MachO/rebase.test
+++ b/llvm/test/tools/llvm-objdump/MachO/rebase.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -macho -rebase -arch x86_64 \
+# RUN: llvm-objdump --macho --rebase --arch x86_64 \
# RUN: %p/Inputs/rebase.macho-x86_64 | FileCheck %s
diff --git a/llvm/test/tools/llvm-objdump/MachO/relocations.test b/llvm/test/tools/llvm-objdump/MachO/relocations.test
index 111cf0cc95b7..95db5ec1ab24 100644
--- a/llvm/test/tools/llvm-objdump/MachO/relocations.test
+++ b/llvm/test/tools/llvm-objdump/MachO/relocations.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -r %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -r %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: Relocation information (__TEXT,__text) 2 entries
CHECK: address pcrel length extern type scattered symbolnum/value
diff --git a/llvm/test/tools/llvm-objdump/MachO/section-contents.test b/llvm/test/tools/llvm-objdump/MachO/section-contents.test
index f62b5a7b52db..cd68e1fa550b 100644
--- a/llvm/test/tools/llvm-objdump/MachO/section-contents.test
+++ b/llvm/test/tools/llvm-objdump/MachO/section-contents.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -s %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -s %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: Contents of section __text:
CHECK: 0000 554889e5 4883ec20 488d0500 000000c7 UH..H.. H.......
diff --git a/llvm/test/tools/llvm-objdump/MachO/section-headers.test b/llvm/test/tools/llvm-objdump/MachO/section-headers.test
index 770b25b22ba5..3012620fcb39 100644
--- a/llvm/test/tools/llvm-objdump/MachO/section-headers.test
+++ b/llvm/test/tools/llvm-objdump/MachO/section-headers.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -h %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -h %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: Sections:
CHECK: Idx Name Size VMA Type
diff --git a/llvm/test/tools/llvm-objdump/MachO/section.test b/llvm/test/tools/llvm-objdump/MachO/section.test
index a8eaa49d88de..3425e6050ef0 100644
--- a/llvm/test/tools/llvm-objdump/MachO/section.test
+++ b/llvm/test/tools/llvm-objdump/MachO/section.test
@@ -1,6 +1,6 @@
-// RUN: llvm-objdump -m -section __DATA,__mod_init_func %p/Inputs/dylibModInit.macho-x86_64 | FileCheck %s -check-prefix=MODINIT
-// RUN: llvm-objdump -m -section __DATA,__mod_init_func -non-verbose %p/Inputs/dylibModInit.macho-x86_64 | FileCheck %s -check-prefix=NON_VERBOSE
-// RUN: llvm-objdump -m -section __DATA,__mod_init_func %p/Inputs/objModInit.macho-x86_64 | FileCheck %s -check-prefix=OBJ_MODINIT
+// RUN: llvm-objdump --macho --section __DATA,__mod_init_func %p/Inputs/dylibModInit.macho-x86_64 | FileCheck %s --check-prefix=MODINIT
+// RUN: llvm-objdump --macho --section __DATA,__mod_init_func --non-verbose %p/Inputs/dylibModInit.macho-x86_64 | FileCheck %s --check-prefix=NON_VERBOSE
+// RUN: llvm-objdump --macho --section __DATA,__mod_init_func %p/Inputs/objModInit.macho-x86_64 | FileCheck %s --check-prefix=OBJ_MODINIT
MODINIT: Contents of (__DATA,__mod_init_func) section
MODINIT: 0x0000000000001000 0x0000000000000f30 _libinit
diff --git a/llvm/test/tools/llvm-objdump/MachO/sections.test b/llvm/test/tools/llvm-objdump/MachO/sections.test
index 7b0d89ce5053..2bed7871b49f 100644
--- a/llvm/test/tools/llvm-objdump/MachO/sections.test
+++ b/llvm/test/tools/llvm-objdump/MachO/sections.test
@@ -1,11 +1,11 @@
-# RUN: llvm-objdump -macho -section=__data %p/Inputs/bind2.macho-x86_64 | FileCheck %s
+# RUN: llvm-objdump --macho --section=__data %p/Inputs/bind2.macho-x86_64 | FileCheck %s
# CHECK: bind2.macho-x86_64:
-# RUN: llvm-objdump -macho -section=__data %p/Inputs/section.macho-armv7 | FileCheck -check-prefix CHECK-ADDR %s
+# RUN: llvm-objdump --macho --section=__data %p/Inputs/section.macho-armv7 | FileCheck --check-prefix CHECK-ADDR %s
# CHECK-ADDR: 00000004 00000001 00000002
-# RUN: llvm-objdump -macho -section=__const %p/Inputs/section.macho-armv7 | FileCheck -check-prefix CHECK-BYTES %s
+# RUN: llvm-objdump --macho --section=__const %p/Inputs/section.macho-armv7 | FileCheck --check-prefix CHECK-BYTES %s
# CHECK-BYTES: 0000000c 00000003 04 05 06
diff --git a/llvm/test/tools/llvm-objdump/MachO/stub-nosyms-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/stub-nosyms-disassembly.test
index af66b0e7a63f..4c2f583d7332 100644
--- a/llvm/test/tools/llvm-objdump/MachO/stub-nosyms-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/MachO/stub-nosyms-disassembly.test
@@ -1,3 +1,3 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/stub-nosyms.macho-x86_64 | FileCheck %s
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/stub-nosyms.macho-x86_64 | FileCheck %s
CHECK: 0000000000000001 callq 0x7 ## symbol stub for: _foo
diff --git a/llvm/test/tools/llvm-objdump/MachO/stubbed-dylib.test b/llvm/test/tools/llvm-objdump/MachO/stubbed-dylib.test
index 6f7f7221eb16..115f97b7fca1 100644
--- a/llvm/test/tools/llvm-objdump/MachO/stubbed-dylib.test
+++ b/llvm/test/tools/llvm-objdump/MachO/stubbed-dylib.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -d %p/Inputs/stubbed.dylib.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -d %p/Inputs/stubbed.dylib.macho-x86_64 | FileCheck %s
CHECK: (__TEXT,__text) section
CHECK-NOT: func
diff --git a/llvm/test/tools/llvm-objdump/MachO/symbol-table.test b/llvm/test/tools/llvm-objdump/MachO/symbol-table.test
index 663edc926a94..06368a265dc8 100644
--- a/llvm/test/tools/llvm-objdump/MachO/symbol-table.test
+++ b/llvm/test/tools/llvm-objdump/MachO/symbol-table.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -t %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -t %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: SYMBOL TABLE:
CHECK-NEXT: 000000000000003b l O __TEXT,__cstring L_.str
diff --git a/llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test
index 699a416a9835..31016a2c1073 100644
--- a/llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test
+++ b/llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test
@@ -1,14 +1,14 @@
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.obj.macho-x86_64 | FileCheck %s -check-prefix=ObjC-OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/ObjC.exe.macho-x86_64 | FileCheck %s -check-prefix=ObjC-EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello_cpp.exe.macho-x86_64 | FileCheck %s -check-prefix=CXX-EXE
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=OBJ
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=EXE
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/ObjC.obj.macho-x86_64 | FileCheck %s --check-prefix=ObjC-OBJ
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/ObjC.exe.macho-x86_64 | FileCheck %s --check-prefix=ObjC-EXE
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello_cpp.exe.macho-x86_64 | FileCheck %s --check-prefix=CXX-EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.obj.macho-i386 | FileCheck %s -check-prefix=i386-OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex %p/Inputs/hello.exe.macho-i386 | FileCheck %s -check-prefix=i386-EXE
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.obj.macho-i386 | FileCheck %s --check-prefix=i386-OBJ
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex %p/Inputs/hello.exe.macho-i386 | FileCheck %s --check-prefix=i386-EXE
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -no-symbolic-operands %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-OBJ
-// RUN: llvm-objdump -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -no-symbolic-operands %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s -check-prefix=NO-SYM-OPS-EXE
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex --no-symbolic-operands %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s --check-prefix=NO-SYM-OPS-OBJ
+// RUN: llvm-objdump -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex --no-symbolic-operands %p/Inputs/hello.exe.macho-x86_64 | FileCheck %s --check-prefix=NO-SYM-OPS-EXE
OBJ: 0000000000000008 leaq L_.str(%rip), %rax ## literal pool for: "Hello world\n"
OBJ: 0000000000000026 callq _printf
diff --git a/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor-i386.test b/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor-i386.test
index a0f753bdb7ad..bcace1788608 100644
--- a/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor-i386.test
+++ b/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor-i386.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -d - | FileCheck %s
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho -d - | FileCheck %s
nop
x:
diff --git a/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor.test b/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor.test
index a730b5c65fa4..a1cdd99a64cb 100644
--- a/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor.test
+++ b/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -d - | FileCheck %s
+# RUN: llvm-mc < %s --triple x86_64-apple-darwin -filetype=obj | llvm-objdump --macho -d - | FileCheck %s
nop
x:
diff --git a/llvm/test/tools/llvm-objdump/MachO/truncated-section.test b/llvm/test/tools/llvm-objdump/MachO/truncated-section.test
index e9fe75da71af..16d56295e458 100644
--- a/llvm/test/tools/llvm-objdump/MachO/truncated-section.test
+++ b/llvm/test/tools/llvm-objdump/MachO/truncated-section.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -d %p/Inputs/truncated-section.dylib.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -d %p/Inputs/truncated-section.dylib.macho-x86_64 | FileCheck %s
CHECK: _func:
CHECK: retq
diff --git a/llvm/test/tools/llvm-objdump/MachO/universal-x86_64.i386.test b/llvm/test/tools/llvm-objdump/MachO/universal-x86_64.i386.test
index 6de7e18e437b..331f97e1ae89 100644
--- a/llvm/test/tools/llvm-objdump/MachO/universal-x86_64.i386.test
+++ b/llvm/test/tools/llvm-objdump/MachO/universal-x86_64.i386.test
@@ -1,15 +1,15 @@
-RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch all \
-RUN: | FileCheck %s -check-prefix UEXE-all
-RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d -no-show-raw-insn -full-leading-addr -print-imm-hex -arch all \
-RUN: | FileCheck %s -check-prefix UEXE-all
-RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d -m -no-show-raw-insn -full-leading-addr -print-imm-hex -arch i386 \
-RUN: | FileCheck %s -check-prefix UArchive-i386
-RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -universal-headers -m \
-RUN: | FileCheck %s -check-prefix FAT
-RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -universal-headers -m \
-RUN: -non-verbose | FileCheck %s -check-prefix NON-VERBOSE
-RUN: llvm-objdump %p/Inputs/macho-universal64.x86_64.i386 -universal-headers \
-RUN: -m | FileCheck %s -check-prefix FAT-64
+RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex --arch all \
+RUN: | FileCheck %s --check-prefix UEXE-all
+RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 -d --no-show-raw-insn --full-leading-addr --print-imm-hex --arch all \
+RUN: | FileCheck %s --check-prefix UEXE-all
+RUN: llvm-objdump %p/Inputs/macho-universal-archive.x86_64.i386 -d --macho --no-show-raw-insn --full-leading-addr --print-imm-hex --arch i386 \
+RUN: | FileCheck %s --check-prefix UArchive-i386
+RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 --universal-headers --macho \
+RUN: | FileCheck %s --check-prefix FAT
+RUN: llvm-objdump %p/Inputs/macho-universal.x86_64.i386 --universal-headers --macho \
+RUN: --non-verbose | FileCheck %s --check-prefix NON-VERBOSE
+RUN: llvm-objdump %p/Inputs/macho-universal64.x86_64.i386 --universal-headers \
+RUN: --macho | FileCheck %s --check-prefix FAT-64
UEXE-all: macho-universal.x86_64.i386 (architecture x86_64):
UEXE-all: (__TEXT,__text) section
diff --git a/llvm/test/tools/llvm-objdump/MachO/unwind-info-arm64.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info-arm64.test
index 712edef50bd8..2b376615e0b3 100644
--- a/llvm/test/tools/llvm-objdump/MachO/unwind-info-arm64.test
+++ b/llvm/test/tools/llvm-objdump/MachO/unwind-info-arm64.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -unwind-info %p/Inputs/unwind-info.macho-arm64 2>/dev/null | FileCheck %s
+# RUN: llvm-objdump --unwind-info %p/Inputs/unwind-info.macho-arm64 2>/dev/null | FileCheck %s
# The 2nd level index here is "regular", including all offsets & encodings in
# full.
diff --git a/llvm/test/tools/llvm-objdump/MachO/unwind-info-no-relocs.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info-no-relocs.test
index 3adad658c087..4246502c0580 100644
--- a/llvm/test/tools/llvm-objdump/MachO/unwind-info-no-relocs.test
+++ b/llvm/test/tools/llvm-objdump/MachO/unwind-info-no-relocs.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -unwind-info %p/Inputs/unwind-info-no-relocs.macho-x86_64 2>/dev/null | FileCheck %s
+# RUN: llvm-objdump --unwind-info %p/Inputs/unwind-info-no-relocs.macho-x86_64 2>/dev/null | FileCheck %s
# Make sure we can deal with __compact_unwind sections that don't have helpful
# relocations.
diff --git a/llvm/test/tools/llvm-objdump/MachO/unwind-info-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info-x86_64.test
index 1333d9a4cdb9..05ad3009c6db 100644
--- a/llvm/test/tools/llvm-objdump/MachO/unwind-info-x86_64.test
+++ b/llvm/test/tools/llvm-objdump/MachO/unwind-info-x86_64.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -unwind-info %p/Inputs/unwind-info.macho-x86_64 2>/dev/null | FileCheck %s
+# RUN: llvm-objdump --unwind-info %p/Inputs/unwind-info.macho-x86_64 2>/dev/null | FileCheck %s
# The 2nd level index in this file is in compressed form, referring to both
# common and packed encodings.
diff --git a/llvm/test/tools/llvm-objdump/MachO/unwind-info.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info.test
index 33db84fc07d1..c7503d9e6518 100644
--- a/llvm/test/tools/llvm-objdump/MachO/unwind-info.test
+++ b/llvm/test/tools/llvm-objdump/MachO/unwind-info.test
@@ -1,4 +1,4 @@
-RUN: llvm-objdump -macho -u %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+RUN: llvm-objdump --macho -u %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: Contents of __compact_unwind section:
CHECK: Entry at offset 0x0:
diff --git a/llvm/test/tools/llvm-objdump/MachO/weak-bind.test b/llvm/test/tools/llvm-objdump/MachO/weak-bind.test
index 1013132a7506..777b44c79228 100644
--- a/llvm/test/tools/llvm-objdump/MachO/weak-bind.test
+++ b/llvm/test/tools/llvm-objdump/MachO/weak-bind.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -macho -weak-bind %p/Inputs/weak-bind.macho-x86_64 \
+# RUN: llvm-objdump --macho --weak-bind %p/Inputs/weak-bind.macho-x86_64 \
# RUN: | FileCheck %s
diff --git a/llvm/test/tools/llvm-objdump/X86/disassemble-align.s b/llvm/test/tools/llvm-objdump/X86/disassemble-align.s
index 8062256becb0..09366c9b6b64 100644
--- a/llvm/test/tools/llvm-objdump/X86/disassemble-align.s
+++ b/llvm/test/tools/llvm-objdump/X86/disassemble-align.s
@@ -1,9 +1,9 @@
# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t
# Use '|' to show where the tabs line up.
-# RUN: llvm-objdump -d -print-imm-hex %t | tr '\t' '|' | FileCheck -strict-whitespace %s
+# RUN: llvm-objdump -d --print-imm-hex %t | tr '\t' '|' | FileCheck --strict-whitespace %s
-# RUN: llvm-objdump -d -print-imm-hex -no-show-raw-insn %t | tr '\t' '|' | \
+# RUN: llvm-objdump -d --print-imm-hex --no-show-raw-insn %t | tr '\t' '|' | \
# RUN: FileCheck -check-prefix=NORAW -strict-whitespace %s
# Instructions are expected to be aligned if the instruction in hex is not too long.
diff --git a/llvm/test/tools/llvm-objdump/X86/disassemble-show-raw.test b/llvm/test/tools/llvm-objdump/X86/disassemble-show-raw.test
index e9956a5ebe4b..30722c0db7fd 100644
--- a/llvm/test/tools/llvm-objdump/X86/disassemble-show-raw.test
+++ b/llvm/test/tools/llvm-objdump/X86/disassemble-show-raw.test
@@ -1,6 +1,6 @@
// RUN: llvm-objdump -d %p/Inputs/trivial.obj.elf-i386 \
// RUN: | FileCheck %s -check-prefix=WITHRAW
-// RUN: llvm-objdump -d -no-show-raw-insn %p/Inputs/trivial.obj.elf-i386 \
+// RUN: llvm-objdump -d --no-show-raw-insn %p/Inputs/trivial.obj.elf-i386 \
// RUN: | FileCheck %s -check-prefix=NORAW
// Expect to find the raw incoding when run with raw output (default), but not
diff --git a/llvm/test/tools/llvm-objdump/X86/function-sections-line-numbers.s b/llvm/test/tools/llvm-objdump/X86/function-sections-line-numbers.s
index f3243bc27cdf..018529ffba3f 100644
--- a/llvm/test/tools/llvm-objdump/X86/function-sections-line-numbers.s
+++ b/llvm/test/tools/llvm-objdump/X86/function-sections-line-numbers.s
@@ -8,7 +8,7 @@
# clang -gdwarf-5 -ffunction-sections test.cpp -o test.s -S
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux -dwarf-version=5 %s -o %t.o
-# RUN: llvm-objdump -disassemble -line-numbers -r -s -section-headers -t %t.o | FileCheck %s
+# RUN: llvm-objdump -d --line-numbers -r -s --section-headers -t %t.o | FileCheck %s
# CHECK: 0000000000000000 <_Z2f1v>
diff --git a/llvm/test/tools/llvm-objdump/X86/invalid-macho-build-version.yaml b/llvm/test/tools/llvm-objdump/X86/invalid-macho-build-version.yaml
index a81bb2dea600..adca65419aa1 100644
--- a/llvm/test/tools/llvm-objdump/X86/invalid-macho-build-version.yaml
+++ b/llvm/test/tools/llvm-objdump/X86/invalid-macho-build-version.yaml
@@ -1,4 +1,4 @@
-# RUN: yaml2obj %s | not llvm-objdump -macho -private-headers -
+# RUN: yaml2obj %s | not llvm-objdump --macho --private-headers -
--- !mach-o
FileHeader:
diff --git a/llvm/test/tools/llvm-objdump/X86/plt.test b/llvm/test/tools/llvm-objdump/X86/plt.test
index 4bd8883a718d..d4847f021a18 100644
--- a/llvm/test/tools/llvm-objdump/X86/plt.test
+++ b/llvm/test/tools/llvm-objdump/X86/plt.test
@@ -1,6 +1,6 @@
-// RUN: llvm-objdump -d %p/Inputs/stripped-elf.so | FileCheck -check-prefix=64 %s
-// RUN: llvm-objdump -d %p/Inputs/hello.exe.elf-i386 | FileCheck -check-prefix=32 %s
-// RUN: llvm-objdump -d %p/Inputs/hello.exe.nopie.elf-i386 | FileCheck -check-prefix=32 %s
+// RUN: llvm-objdump -d %p/Inputs/stripped-elf.so | FileCheck --check-prefix=64 %s
+// RUN: llvm-objdump -d %p/Inputs/hello.exe.elf-i386 | FileCheck --check-prefix=32 %s
+// RUN: llvm-objdump -d %p/Inputs/hello.exe.nopie.elf-i386 | FileCheck --check-prefix=32 %s
# 64: Disassembly of section .plt:
# 64: <__gmon_start__ at plt>:
diff --git a/llvm/test/tools/llvm-objdump/X86/section-index.s b/llvm/test/tools/llvm-objdump/X86/section-index.s
index 6ca86ea19b57..5ba1f4bdc830 100644
--- a/llvm/test/tools/llvm-objdump/X86/section-index.s
+++ b/llvm/test/tools/llvm-objdump/X86/section-index.s
@@ -1,6 +1,6 @@
# RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux -o %t
-# RUN: llvm-objdump -section-headers %t | FileCheck %s
+# RUN: llvm-objdump --section-headers %t | FileCheck %s
# CHECK: Idx Name
# CHECK: 3 .foo
# CHECK-NEXT: 4 .bar
@@ -8,7 +8,7 @@
## Check we report the valid section index
## when requesting a specific section.
-# RUN: llvm-objdump -section-headers -section=.bar %t \
+# RUN: llvm-objdump --section-headers --section=.bar %t \
# RUN: | FileCheck %s --check-prefix=BAR
# BAR: Idx Name
# BAR-NEXT: 4 .bar
diff --git a/llvm/test/tools/llvm-objdump/archive-headers.test b/llvm/test/tools/llvm-objdump/archive-headers.test
index bb649a657a16..9cdc68416da6 100644
--- a/llvm/test/tools/llvm-objdump/archive-headers.test
+++ b/llvm/test/tools/llvm-objdump/archive-headers.test
@@ -1,5 +1,5 @@
# RUN: llvm-objdump -a %p/Inputs/liblong_filenames.a | FileCheck %s
-# RUN: llvm-objdump -archive-headers %p/Inputs/liblong_filenames.a | FileCheck %s
+# RUN: llvm-objdump --archive-headers %p/Inputs/liblong_filenames.a | FileCheck %s
# CHECK: {{.*}}liblong_filenames.a(1.o): file format elf64-x86-64
# CHECK: rw-r--r-- 204299/200 1416 {{.*}} 1.o
diff --git a/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test b/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
index 76143248ef85..67d240826914 100644
--- a/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
+++ b/llvm/test/tools/llvm-objdump/eh_frame-mipsel.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -dwarf=frames %p/Inputs/eh_frame.elf-mipsel | FileCheck %s
+# RUN: llvm-objdump --dwarf=frames %p/Inputs/eh_frame.elf-mipsel | FileCheck %s
# CHECK: .eh_frame contents:
diff --git a/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test b/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
index 652fd0a4e191..4702162a749b 100644
--- a/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
+++ b/llvm/test/tools/llvm-objdump/eh_frame_zero_cie.test
@@ -1,4 +1,4 @@
-# RUN: llvm-objdump -dwarf=frames %p/Inputs/eh_frame_zero_cie.o 2>/dev/null | FileCheck %s
+# RUN: llvm-objdump --dwarf=frames %p/Inputs/eh_frame_zero_cie.o 2>/dev/null | FileCheck %s
# CHECK: .eh_frame contents:
diff --git a/llvm/test/tools/llvm-objdump/embedded-source.test b/llvm/test/tools/llvm-objdump/embedded-source.test
index fd1ce71686c3..ae3c894e3bff 100644
--- a/llvm/test/tools/llvm-objdump/embedded-source.test
+++ b/llvm/test/tools/llvm-objdump/embedded-source.test
@@ -1,5 +1,5 @@
-; RUN: llvm-objdump -disassemble -line-numbers %p/Inputs/embedded-source | FileCheck --check-prefix=LINE %s
-; RUN: llvm-objdump -disassemble -source %p/Inputs/embedded-source | FileCheck --check-prefix=SOURCE %s
+; RUN: llvm-objdump --disassemble --line-numbers %p/Inputs/embedded-source | FileCheck --check-prefix=LINE %s
+; RUN: llvm-objdump --disassemble --source %p/Inputs/embedded-source | FileCheck --check-prefix=SOURCE %s
; REQUIRES: x86-registered-target
; Source for embedded-source.c
diff --git a/llvm/test/tools/llvm-objdump/file-headers-pe.test b/llvm/test/tools/llvm-objdump/file-headers-pe.test
index b0146226d68a..6609a9f83e6c 100644
--- a/llvm/test/tools/llvm-objdump/file-headers-pe.test
+++ b/llvm/test/tools/llvm-objdump/file-headers-pe.test
@@ -1,6 +1,6 @@
# RUN: yaml2obj %s -o %t
# RUN: llvm-objdump -f %t | FileCheck %s
-# RUN: llvm-objdump -file-headers %t | FileCheck %s
+# RUN: llvm-objdump --file-headers %t | FileCheck %s
!COFF
header: !Header
diff --git a/llvm/test/tools/llvm-objdump/invalid-input.test b/llvm/test/tools/llvm-objdump/invalid-input.test
index 20a901d0b2de..582abc668b9f 100644
--- a/llvm/test/tools/llvm-objdump/invalid-input.test
+++ b/llvm/test/tools/llvm-objdump/invalid-input.test
@@ -1,6 +1,6 @@
-RUN: not llvm-objdump -t %p/missing-file 2>&1 | FileCheck %s -check-prefix=NO_SUCH_FILE
+RUN: not llvm-objdump -t %p/missing-file 2>&1 | FileCheck %s --check-prefix=NO_SUCH_FILE
# Don't check the OS-dependent message "No such file or directory".
NO_SUCH_FILE: '{{.*}}missing-file':
-RUN: not llvm-objdump -t %s 2>&1 | FileCheck %s -check-prefix=UNKNOWN_FILE_TYPE
+RUN: not llvm-objdump -t %s 2>&1 | FileCheck %s --check-prefix=UNKNOWN_FILE_TYPE
UNKNOWN_FILE_TYPE: '{{.*}}invalid-input.test': The file was not recognized as a valid object file
diff --git a/llvm/test/tools/llvm-objdump/malformed-archives.test b/llvm/test/tools/llvm-objdump/malformed-archives.test
index 00c264ed1392..4508c0baca06 100644
--- a/llvm/test/tools/llvm-objdump/malformed-archives.test
+++ b/llvm/test/tools/llvm-objdump/malformed-archives.test
@@ -1,49 +1,49 @@
// These test checks that llvm-objdump will not crash with malformed Archive
// files. So the check line is not all that important but the bug fixes to
// make sure llvm-objdump is robust is what matters.
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus1.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus1 %s
# bogus1: libbogus1.a': truncated or malformed archive (characters in size field in archive header are not all decimal numbers: '10%' for archive member header at offset 8)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus2.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus2 %s
# bogus2: libbogus2.a': truncated or malformed archive (characters in size field in archive header are not all decimal numbers: '1%' for archive member header at offset 170)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus3.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus3 %s
# bogus3: libbogus3.a': truncated or malformed archive (offset to next archive member past the end of the archive after member foo.c)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus4.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus4 %s
# bogus4: libbogus4.a': truncated or malformed archive (remaining size of archive too small for next archive member header for foo.c)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus5.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus5 %s
# bogus5: libbogus5.a': truncated or malformed archive (terminator characters in archive member "@\n" not the correct "`\n" values for the archive member header for hello.c)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus6.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus6 %s
# bogus6: libbogus6.a': truncated or malformed archive (name contains a leading space for archive member header at offset 96)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus7.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus7 %s
# bogus7: libbogus7.a': truncated or malformed archive (long name length characters after the #1/ are not all decimal numbers: '@123$' for archive member header at offset 8)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus8.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus8 %s
@@ -59,25 +59,25 @@
# bogus10: libbogus10.a(<file index: 0>): truncated or malformed archive (long name offset 507 past the end of the string table for archive member header at offset 94)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus11.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus11 %s
# bogus11: libbogus11.a(hello.c): truncated or malformed archive (characters in UID field in archive header are not all decimal numbers: '~97&' for the archive member header at offset 8)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus12.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus12 %s
# bogus12: libbogus12.a(hello.c): truncated or malformed archive (characters in GID field in archive header are not all decimal numbers: '#55!' for the archive member header at offset 8)
-# RUN: not llvm-objdump -macho -archive-headers \
+# RUN: not llvm-objdump --macho --archive-headers \
# RUN: %p/Inputs/libbogus13.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus13 %s
# bogus13: libbogus13.a(hello.c): truncated or malformed archive (characters in AccessMode field in archive header are not all decimal numbers: 'Feed' for the archive member header at offset 8)
-# RUN: llvm-objdump -macho -archive-headers %p/Inputs/libbogus14.a \
+# RUN: llvm-objdump --macho --archive-headers %p/Inputs/libbogus14.a \
# RUN: 2>&1 | FileCheck -check-prefix=bogus14 %s
# bogus14: -rw-r--r--124/0 102 (date: "1foobar273" contains non-decimal chars) hello.c
diff --git a/llvm/test/tools/llvm-objdump/wasm/file-headers-unsupported.test b/llvm/test/tools/llvm-objdump/wasm/file-headers-unsupported.test
index f9fc11884208..75574f16829b 100644
--- a/llvm/test/tools/llvm-objdump/wasm/file-headers-unsupported.test
+++ b/llvm/test/tools/llvm-objdump/wasm/file-headers-unsupported.test
@@ -1,3 +1,3 @@
-# RUN: not llvm-objdump -file-headers %p/Inputs/trivial.obj.wasm 2>&1 | FileCheck %s
+# RUN: not llvm-objdump --file-headers %p/Inputs/trivial.obj.wasm 2>&1 | FileCheck %s
# CHECK: Invalid/Unsupported object file format
diff --git a/llvm/test/tools/llvm-objdump/wasm/wasm.txt b/llvm/test/tools/llvm-objdump/wasm/wasm.txt
index 6c4deacdf9f2..dbe8f7652bf7 100644
--- a/llvm/test/tools/llvm-objdump/wasm/wasm.txt
+++ b/llvm/test/tools/llvm-objdump/wasm/wasm.txt
@@ -10,12 +10,12 @@
# CHECK-NEXT: 5 linking 0000006d 00000000
# CHECK-NEXT: 6 reloc.CODE 0000000f 00000000
-# RUN: llvm-objdump -p %p/Inputs/trivial.obj.wasm | FileCheck %s -check-prefix CHECK-HEADER
+# RUN: llvm-objdump -p %p/Inputs/trivial.obj.wasm | FileCheck %s --check-prefix CHECK-HEADER
# CHECK-HEADER: Program Header:
# CHECK-HEADER: Version: 0x1
-# RUN: llvm-objdump -s --section=CODE %p/Inputs/trivial.obj.wasm | FileCheck %s -check-prefix CHECK-SECTIONS
+# RUN: llvm-objdump -s --section=CODE %p/Inputs/trivial.obj.wasm | FileCheck %s --check-prefix CHECK-SECTIONS
# CHECK-SECTIONS: Contents of section CODE:
# CHECK-SECTIONS: 0000 02170041 80808080 00108080 8080001a ...A............
More information about the llvm-commits
mailing list