add support for -Wextra and -W

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

2 files changed, 7 insertions, 1 deletions

diff --git a/include/clang/Basic/Diagnostic.td b/include/clang/Basic/Diagnostic.td
index e842c5330d..0328fbcfc9 100644
--- a/include/clang/Basic/Diagnostic.td
+++ b/include/clang/Basic/Diagnostic.td
@@ -34,6 +34,12 @@ class InGroup<DiagGroup G> { DiagGroup Group = G; }
 def ImplicitFunctionDeclare : DiagGroup<"implicit-function-declaration">;
 def Trigraphs : DiagGroup<"trigraphs">;
 
+// Empty DiagGroups: these are recognized by clang but ignored.
+def : DiagGroup<"extra">;
+def : DiagGroup<"">;  // -W
+
+
+
 
 
 
diff --git a/tools/clang-cc/Warnings.cpp b/tools/clang-cc/Warnings.cpp
index af50ce4648..9cd1cc3c82 100644
--- a/tools/clang-cc/Warnings.cpp
+++ b/tools/clang-cc/Warnings.cpp
@@ -37,7 +37,7 @@ using namespace clang;
 // driver has stripped off -Wa,foo etc.  The driver has also translated -W to
 // -Wextra, so we don't need to worry about it.
 static llvm::cl::list<std::string>
-OptWarnings("W", llvm::cl::Prefix);
+OptWarnings("W", llvm::cl::Prefix, llvm::cl::ValueOptional);
 
 static llvm::cl::opt<bool> OptPedantic("pedantic");
 static llvm::cl::opt<bool> OptPedanticErrors("pedantic-errors");