Index: lld/MachO/DriverUtils.cpp =================================================================== --- lld/MachO/DriverUtils.cpp +++ lld/MachO/DriverUtils.cpp @@ -70,6 +70,10 @@ opt::InputArgList args = ParseArgs(vec, missingIndex, missingCount); + // Handle -fatal_warnings early since it converts missing argument warnings + // to errors. + errorHandler().fatalWarnings = args.hasArg(OPT_fatal_warnings); + if (missingCount) error(Twine(args.getArgString(missingIndex)) + ": missing argument"); Index: lld/MachO/Options.td =================================================================== --- lld/MachO/Options.td +++ lld/MachO/Options.td @@ -606,9 +606,7 @@ Flags<[HelpHidden]>, Group; def fatal_warnings : Flag<["-"], "fatal_warnings">, - HelpText<"Escalate warnings as errors">, - Flags<[HelpHidden]>, - Group; + HelpText<"Treat warnings as errors">; def no_eh_labels : Flag<["-"], "no_eh_labels">, HelpText<"In -r mode, suppress .eh labels in the __eh_frame section">, Flags<[HelpHidden]>, Index: lld/test/MachO/fatal-warnings.s =================================================================== --- /dev/null +++ lld/test/MachO/fatal-warnings.s @@ -0,0 +1,13 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t1.o + +# RUN: %lld %t1.o -o /dev/null -single_module 2>&1 \ +# RUN: | FileCheck -check-prefix=WARNING %s +# RUN: not %lld %t1.o -fatal_warnings -o /dev/null -single_module 2>&1 \ +# RUN: | FileCheck -check-prefix=ERROR %s + +# ERROR: error: Option `-single_module' is deprecated +# WARNING: warning: Option `-single_module' is deprecated + +.globl _main +_main: