Tweek r156937 a bit so that the suggestions are correct.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156938 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Frontend/Warnings.cpp b/lib/Frontend/Warnings.cpp
index 80c0ebf57b99ed6c2d074564ba742a87294e0cfc..24b7acacfdee9911c9a0adc2c756962192547430 100644 (file)
--- a/lib/Frontend/Warnings.cpp
+++ b/lib/Frontend/Warnings.cpp
@@ -183,7 +183,8 @@ void clang::ProcessWarningOptions(DiagnosticsEngine &Diags,
       
       if (Report) {
         if (DiagIDs->getDiagnosticsInGroup(Opt, _Diags))
-          EmitUnknownDiagWarning(Diags, "-W", OrigOpt, isPositive);
+          EmitUnknownDiagWarning(Diags, isPositive ? "-W" : "-Wno-", Opt,
+                                 isPositive);
       } else {
         Diags.setDiagnosticGroupMapping(Opt, Mapping);
       }

diff --git a/test/Driver/warning-options.cpp b/test/Driver/warning-options.cpp
index 1a2d51d528c8edcd893cc3317543acf7abf708a8..ce434ab006ed1ca3c0e4f231ea48e0704a513a40 100644 (file)
--- a/test/Driver/warning-options.cpp
+++ b/test/Driver/warning-options.cpp
@@ -7,4 +7,4 @@
 // RUN:        -Wno-unused-command-line-argument %s 2>&1 | FileCheck %s
 // CHECK: unknown warning option '-Wmonkey'
 // CHECK: unknown warning option '-Wno-monkey'
-// CHECK: unknown warning option '-Wno-unused-command-line-arguments'
+// CHECK: unknown warning option '-Wno-unused-command-line-arguments'; did you mean '-Wno-unused-command-line-argument'?