diff --git a/lld/test/MachO/export-options.s b/lld/test/MachO/export-options.s
--- a/lld/test/MachO/export-options.s
+++ b/lld/test/MachO/export-options.s
@@ -42,7 +42,7 @@
 # EXPORT-DAG: g     F __TEXT,__text _keep_lazy
 
 ## Check that exported symbol is global
-# RUN: %no_fatal_warnings_lld -dylib %t/default.o -o %t/hidden-export \
+# RUN: %no-fatal-warnings-lld -dylib %t/default.o -o %t/hidden-export \
 # RUN:         -exported_symbol _private_extern 2>&1 | \
 # RUN:     FileCheck --check-prefix=PRIVATE %s
 
diff --git a/lld/test/MachO/fatal-warnings.s b/lld/test/MachO/fatal-warnings.s
--- a/lld/test/MachO/fatal-warnings.s
+++ b/lld/test/MachO/fatal-warnings.s
@@ -1,9 +1,9 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t1.o
 
-# RUN: %no_fatal_warnings_lld %t1.o -o /dev/null -single_module 2>&1 \
+# RUN: %no-fatal-warnings-lld %t1.o -o /dev/null -single_module 2>&1 \
 # RUN:     | FileCheck -check-prefix=WARNING %s
-# RUN: not %no_fatal_warnings_lld %t1.o -fatal_warnings -o /dev/null \
+# RUN: not %no-fatal-warnings-lld %t1.o -fatal_warnings -o /dev/null \
 # RUN:     -single_module 2>&1 | FileCheck -check-prefix=ERROR %s
 
 # ERROR: error: Option `-single_module' is deprecated
diff --git a/lld/test/MachO/install-name.s b/lld/test/MachO/install-name.s
--- a/lld/test/MachO/install-name.s
+++ b/lld/test/MachO/install-name.s
@@ -2,12 +2,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t.o %s
 
-# RUN: %no_fatal_warnings_lld --warn-dylib-install-name -o %t.exec %t.o \
+# RUN: %no-fatal-warnings-lld --warn-dylib-install-name -o %t.exec %t.o \
 # RUN:     -install_name foo 2>&1 | FileCheck --check-prefix=WARN %s
 # RUN: llvm-objdump --macho --all-headers %t.exec \
 # RUN:     | FileCheck --check-prefix=NO-ID %s
 
-# RUN: %no_fatal_warnings_lld --warn-dylib-install-name -bundle -o %t.bundle %t.o \
+# RUN: %no-fatal-warnings-lld --warn-dylib-install-name -bundle -o %t.bundle %t.o \
 # RUN:     -install_name foo 2>&1 | FileCheck --check-prefix=WARN %s
 # RUN: llvm-objdump --macho --all-headers %t.bundle \
 # RUN:     | FileCheck --check-prefix=NO-ID %s
diff --git a/lld/test/MachO/invalid/incompatible-arch.s b/lld/test/MachO/invalid/incompatible-arch.s
--- a/lld/test/MachO/invalid/incompatible-arch.s
+++ b/lld/test/MachO/invalid/incompatible-arch.s
@@ -4,8 +4,8 @@
 
 # RUN: llvm-mc -filetype=obj -triple=arm64-apple-darwin %s -o %t/test.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/native.o
-# RUN: not %no_fatal_warnings_lld -arch x86_64 -lSystem %t/test.o -o /dev/null -arch_errors_fatal 2>&1 | FileCheck %s -DFILE=%t/test.o --check-prefix=CHECK-ERROR
-# RUN: %no_fatal_warnings_lld -arch x86_64 -lSystem %t/test.o %t/native.o -o /dev/null 2>&1 | FileCheck %s -DFILE=%t/test.o --check-prefix=CHECK-WARNING
+# RUN: not %no-fatal-warnings-lld -arch x86_64 -lSystem %t/test.o -o /dev/null -arch_errors_fatal 2>&1 | FileCheck %s -DFILE=%t/test.o --check-prefix=CHECK-ERROR
+# RUN: %no-fatal-warnings-lld -arch x86_64 -lSystem %t/test.o %t/native.o -o /dev/null 2>&1 | FileCheck %s -DFILE=%t/test.o --check-prefix=CHECK-WARNING
 # RUN: %lld -arch arm64 -lSystem %t/test.o -arch_errors_fatal -o /dev/null
 # CHECK-ERROR: error: {{.*}}[[FILE]] has architecture arm64 which is incompatible with target architecture x86_64
 # CHECK-WARNING: warning: {{.*}}[[FILE]] has architecture arm64 which is incompatible with target architecture x86_64
@@ -18,7 +18,7 @@
 
 # RUN: %lld -lSystem -dylib -arch arm64 -platform_version macOS 10.14.0 10.15.0 %t/out.dylib -o /dev/null
 
-# RUN: %no_fatal_warnings_lld -lSystem -dylib -arch arm64 -platform_version macOS 10.13.0 10.15.0 %t/out.dylib \
+# RUN: %no-fatal-warnings-lld -lSystem -dylib -arch arm64 -platform_version macOS 10.13.0 10.15.0 %t/out.dylib \
 # RUN:  -o /dev/null 2>&1 | FileCheck %s --check-prefix=DYLIB-VERSION
 # DYLIB-VERSION: warning: {{.*}}out.dylib has version 10.14.0, which is newer than target minimum of 10.13.0
 
@@ -30,7 +30,7 @@
 
 # RUN: %lld %t/test_x86.o -lSystem -arch x86_64 -platform_version macOS 10.15.0 10.15.0 -o /dev/null
 
-# RUN: %no_fatal_warnings_lld %t/test_x86.o -lSystem -arch x86_64 -platform_version macOS 10.14.0 10.15.0 \
+# RUN: %no-fatal-warnings-lld %t/test_x86.o -lSystem -arch x86_64 -platform_version macOS 10.14.0 10.15.0 \
 # RUN:  -o /dev/null 2>&1 | FileCheck %s --check-prefix=OBJ-VERSION
 # OBJ-VERSION: warning: {{.*}}test_x86.o has version 10.15.0, which is newer than target minimum of 10.14.0
 
diff --git a/lld/test/MachO/lit.local.cfg b/lld/test/MachO/lit.local.cfg
--- a/lld/test/MachO/lit.local.cfg
+++ b/lld/test/MachO/lit.local.cfg
@@ -13,7 +13,7 @@
 lld_watchos = ('ld64.lld -arch arm64_32 -platform_version watchos 7.0 8.0 -syslibroot ' +
     os.path.join(config.test_source_root, "MachO", "Inputs", "WatchOS.sdk"))
 config.substitutions.append(('%lld-watchos', lld_watchos + ' -fatal_warnings'))
-config.substitutions.append(('%no_fatal_warnings_lld-watchos', lld_watchos))
+config.substitutions.append(('%no-fatal-warnings-lld-watchos', lld_watchos))
 
 config.substitutions.append(('%no-arg-lld', 'ld64.lld'))
 
@@ -22,4 +22,4 @@
 lld = ('ld64.lld -arch x86_64 -platform_version macos 10.15 11.0 -syslibroot ' +
     os.path.join(config.test_source_root, "MachO", "Inputs", "MacOSX.sdk"))
 config.substitutions.append(('%lld', lld + ' -fatal_warnings'))
-config.substitutions.append(('%no_fatal_warnings_lld', lld))
+config.substitutions.append(('%no-fatal-warnings-lld', lld))
diff --git a/lld/test/MachO/lto-irmover-warning.ll b/lld/test/MachO/lto-irmover-warning.ll
--- a/lld/test/MachO/lto-irmover-warning.ll
+++ b/lld/test/MachO/lto-irmover-warning.ll
@@ -2,7 +2,7 @@
 ; RUN: rm -rf %t; split-file %s %t
 ; RUN: llvm-as -o %t/first.bc %t/first.ll
 ; RUN: llvm-as -o %t/second.bc %t/second.ll
-; RUN: %no_fatal_warnings_lld -dylib %t/first.bc %t/second.bc -o /dev/null 2>&1 | FileCheck %s
+; RUN: %no-fatal-warnings-lld -dylib %t/first.bc %t/second.bc -o /dev/null 2>&1 | FileCheck %s
 
 ;; FIXME: can we replace ld-temp.o with a proper name?
 ; CHECK: warning: linking module flags 'foo': IDs have conflicting values ('i32 2' from {{.*}}second.bc with 'i32 1' from ld-temp.o)
diff --git a/lld/test/MachO/mark-dead-strippable-dylib.s b/lld/test/MachO/mark-dead-strippable-dylib.s
--- a/lld/test/MachO/mark-dead-strippable-dylib.s
+++ b/lld/test/MachO/mark-dead-strippable-dylib.s
@@ -2,12 +2,12 @@
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t.o %s
 
-# RUN: %no_fatal_warnings_lld -o %t.exec %t.o -mark_dead_strippable_dylib 2>&1 \
+# RUN: %no-fatal-warnings-lld -o %t.exec %t.o -mark_dead_strippable_dylib 2>&1 \
 # RUN:     | FileCheck --check-prefix=WARN %s
 # RUN: llvm-objdump --macho --private-header %t.exec \
 # RUN:     | FileCheck --check-prefix=NO-DS %s
 
-# RUN: %no_fatal_warnings_lld -bundle -o %t.bundle %t.o \
+# RUN: %no-fatal-warnings-lld -bundle -o %t.bundle %t.o \
 # RUN:     -mark_dead_strippable_dylib 2>&1 \
 # RUN:     | FileCheck --check-prefix=WARN %s
 # RUN: llvm-objdump --macho --private-header %t.bundle \
diff --git a/lld/test/MachO/pagezero.s b/lld/test/MachO/pagezero.s
--- a/lld/test/MachO/pagezero.s
+++ b/lld/test/MachO/pagezero.s
@@ -12,13 +12,13 @@
 # RUN: %lld -lSystem -arch x86_64 -o %t/zero %t/x86_64.o -pagezero_size 0
 # RUN: llvm-readobj --macho-segment %t/zero | FileCheck %s --check-prefix=CHECK-ZERO -D#VMSIZE=0x1000 -D#SIZE=152
 
-# RUN: %no_fatal_warnings_lld -lSystem -arch x86_64 -o %t/x86_64-misalign %t/x86_64.o -pagezero_size 1001 2>&1 | FileCheck %s --check-prefix=LINK -D#SIZE=0x1000
+# RUN: %no-fatal-warnings-lld -lSystem -arch x86_64 -o %t/x86_64-misalign %t/x86_64.o -pagezero_size 1001 2>&1 | FileCheck %s --check-prefix=LINK -D#SIZE=0x1000
 # RUN: llvm-readobj --macho-segment %t/x86_64-misalign | FileCheck %s -D#VMSIZE=0x1000 -D#SIZE=72
 
-# RUN: %no_fatal_warnings_lld-watchos -lSystem -arch arm64_32 -o %t/arm64_32-misalign-4K %t/arm64_32.o -pagezero_size 1001 2>&1 | FileCheck %s --check-prefix=LINK -D#SIZE=0x0
+# RUN: %no-fatal-warnings-lld-watchos -lSystem -arch arm64_32 -o %t/arm64_32-misalign-4K %t/arm64_32.o -pagezero_size 1001 2>&1 | FileCheck %s --check-prefix=LINK -D#SIZE=0x0
 # RUN: llvm-readobj --macho-segment %t/arm64_32-misalign-4K | FileCheck %s --check-prefix=CHECK-ZERO -D#VMSIZE=0x4000 -D#SIZE=124
 
-# RUN: %no_fatal_warnings_lld-watchos -lSystem -arch arm64_32 -o %t/arm64_32-misalign-16K %t/arm64_32.o -pagezero_size 4001 2>&1 | FileCheck %s --check-prefix=LINK -D#SIZE=0x4000
+# RUN: %no-fatal-warnings-lld-watchos -lSystem -arch arm64_32 -o %t/arm64_32-misalign-16K %t/arm64_32.o -pagezero_size 4001 2>&1 | FileCheck %s --check-prefix=LINK -D#SIZE=0x4000
 # RUN: llvm-readobj --macho-segment %t/arm64_32-misalign-16K | FileCheck %s -D#VMSIZE=0x4000 -D#SIZE=56
 
 # LINK: warning: __PAGEZERO size is not page aligned, rounding down to 0x[[#%x,SIZE]]
diff --git a/lld/test/MachO/special-symbol-ld-install-name.s b/lld/test/MachO/special-symbol-ld-install-name.s
--- a/lld/test/MachO/special-symbol-ld-install-name.s
+++ b/lld/test/MachO/special-symbol-ld-install-name.s
@@ -20,7 +20,7 @@
 
 ## Check that we emit a warning for an invalid os version.
 
-# RUN: %no_fatal_warnings_lld -o %t/libfoo3.dylib %t/libLDInstallNameInvalid.tbd %t/foo.o -dylib \
+# RUN: %no-fatal-warnings-lld -o %t/libfoo3.dylib %t/libLDInstallNameInvalid.tbd %t/foo.o -dylib \
 # RUN:  -platform_version macos 11.0.0 11.0.0 2>&1 | FileCheck --check-prefix=INVALID-VERSION %s
 
 # INVALID-VERSION: failed to parse os version, symbol '$ld$install_name$os11.a$/New' ignored
diff --git a/lld/test/MachO/special-symbol-ld-previous.s b/lld/test/MachO/special-symbol-ld-previous.s
--- a/lld/test/MachO/special-symbol-ld-previous.s
+++ b/lld/test/MachO/special-symbol-ld-previous.s
@@ -27,7 +27,7 @@
 
 ## Check that we emit a warning for an invalid start, end and compatibility versions.
 
-# RUN: %no_fatal_warnings_lld -o %t/libfoo1.dylib %t/libLDPreviousInvalid.tbd %t/foo.o -dylib \
+# RUN: %no-fatal-warnings-lld -o %t/libfoo1.dylib %t/libLDPreviousInvalid.tbd %t/foo.o -dylib \
 # RUN:  -platform_version macos 11.0.0 11.0.0 2>&1 | FileCheck --check-prefix=INVALID-VERSION %s
 
 # INVALID-VERSION-DAG: failed to parse start version, symbol '$ld$previous$/New$1.2.3$1$3.a$14.0$$' ignored
diff --git a/lld/test/MachO/treat-undef-sym.s b/lld/test/MachO/treat-undef-sym.s
--- a/lld/test/MachO/treat-undef-sym.s
+++ b/lld/test/MachO/treat-undef-sym.s
@@ -17,7 +17,7 @@
 # RUN: llvm-objdump --macho --lazy-bind %t/live.out \
 # RUN:     | FileCheck --check-prefix=BIND %s
 
-# RUN: %no_fatal_warnings_lld -lSystem -flat_namespace -undefined warning \
+# RUN: %no-fatal-warnings-lld -lSystem -flat_namespace -undefined warning \
 # RUN:     -o %t/live.out %t/live.o 2>&1 | \
 # RUN:     FileCheck %s -check-prefix=WARNING
 # RUN: llvm-objdump --macho --lazy-bind %t/live.out \
diff --git a/lld/test/MachO/umbrella.s b/lld/test/MachO/umbrella.s
--- a/lld/test/MachO/umbrella.s
+++ b/lld/test/MachO/umbrella.s
@@ -4,7 +4,7 @@
 # RUN: %lld -dylib -o %t.dylib -umbrella umbrella.dylib %t.o
 # RUN: llvm-otool -lv %t.dylib | FileCheck %s
 
-# RUN: %no_fatal_warnings_lld -bundle -o %t.so -umbrella umbrella.dylib %t.o \
+# RUN: %no-fatal-warnings-lld -bundle -o %t.so -umbrella umbrella.dylib %t.o \
 # RUN:   2>&1 | FileCheck --check-prefix=WARN %s
 # WARN: warning: -umbrella used, but not creating dylib
 # RUN: llvm-otool -lv %t.so | FileCheck %s