diff --git a/lld/MachO/DriverUtils.cpp b/lld/MachO/DriverUtils.cpp --- a/lld/MachO/DriverUtils.cpp +++ b/lld/MachO/DriverUtils.cpp @@ -76,6 +76,10 @@ cl::ExpandResponseFiles(saver, cl::TokenizeGNUCommandLine, vec); 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"); diff --git a/lld/MachO/Options.td b/lld/MachO/Options.td --- a/lld/MachO/Options.td +++ b/lld/MachO/Options.td @@ -610,8 +610,7 @@ Flags<[HelpHidden]>, Group; def fatal_warnings : Flag<["-"], "fatal_warnings">, - HelpText<"Escalate warnings as errors">, - Flags<[HelpHidden]>, + HelpText<"Treat warnings as errors">, Group; def no_eh_labels : Flag<["-"], "no_eh_labels">, HelpText<"In -r mode, suppress .eh labels in the __eh_frame section">, diff --git a/lld/test/MachO/fatal-warnings.s b/lld/test/MachO/fatal-warnings.s new file mode 100644 --- /dev/null +++ b/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: