From f3ad7201301d1aef649659b5bae312efabc147b2 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 3 Sep 2013 23:18:43 +0000 Subject: [PATCH] clang-cl: Make -W a core option so we can adjust clang warnings. llvm-svn: 189882 --- clang/include/clang/Driver/Options.td | 2 +- clang/test/Driver/cl-options.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 19665ffe39d3..e99e828c5f3e 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -250,7 +250,7 @@ def Wp_COMMA : CommaJoined<["-"], "Wp,">, MetaVarName<"">; def Wwrite_strings : Flag<["-"], "Wwrite-strings">, Group, Flags<[CC1Option]>; def Wno_write_strings : Flag<["-"], "Wno-write-strings">, Group, Flags<[CC1Option]>; -def W_Joined : Joined<["-"], "W">, Group, Flags<[CC1Option]>, +def W_Joined : Joined<["-"], "W">, Group, Flags<[CC1Option, CoreOption]>, MetaVarName<"">, HelpText<"Enable the specified warning">; def Xanalyzer : Separate<["-"], "Xanalyzer">, HelpText<"Pass to the static analyzer">, MetaVarName<"">; diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 7e9b0c49b8b3..899efe481a18 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -88,6 +88,10 @@ // RUN: %clang_cl /Zs -### -- %s 2>&1 | FileCheck -check-prefix=Zs %s // Zs: -fsyntax-only +// We forward any unrecognized -W diagnostic options to cc1. +// RUN: %clang_cl -Wunused-pragmas -### -- %s 2>&1 | FileCheck -check-prefix=WJoined %s +// WJoined: "-cc1" +// WJoined: "-Wunused-pragmas" // Ignored options. Check that we don't get "unused during compilation" errors. // (/Zs is for syntax-only, /WX is for -Werror)