From 6560839a11e653800ec92a2279cef5988d861a7d Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Mon, 16 Sep 2013 23:11:56 +0000 Subject: [PATCH] clang-cl: ignore all /w options We previously ignored /wd, but I think we can ignore the rest too. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190819 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/CLCompatOptions.td | 3 +-- test/Driver/cl-options.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/clang/Driver/CLCompatOptions.td b/include/clang/Driver/CLCompatOptions.td index 77acfbcea2..1941c608c9 100644 --- a/include/clang/Driver/CLCompatOptions.td +++ b/include/clang/Driver/CLCompatOptions.td @@ -131,7 +131,7 @@ def _SLASH_Ob2 : CLIgnoredFlag<"Ob2">; def _SLASH_RTC : CLIgnoredJoined<"RTC">; def _SLASH_Zc_forScope : CLIgnoredFlag<"Zc:forScope">; def _SLASH_Zc_wchar_t : CLIgnoredFlag<"Zc:wchar_t">; -def _SLASH_wd : CLIgnoredJoined<"wd">; +def _SLASH_w : CLIgnoredJoined<"w">; // Unsupported: @@ -150,7 +150,6 @@ def _SLASH_Gy_ : CLFlag<"Gy-">; def _SLASH_GZ : CLFlag<"GZ">; def _SLASH_MP : CLJoined<"MP">; def _SLASH_o : CLJoinedOrSeparate<"o">; -def _SLASH_w : CLJoined<"w">; def _SLASH_Za : CLFlag<"Za">; def _SLASH_Zc : CLJoined<"Zc:">; def _SLASH_ZI : CLFlag<"ZI">; diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c index ab0320cf6e..f74a16c433 100644 --- a/test/Driver/cl-options.c +++ b/test/Driver/cl-options.c @@ -96,7 +96,7 @@ // Ignored options. Check that we don't get "unused during compilation" errors. // (/Zs is for syntax-only, /WX is for -Werror) // RUN: %clang_cl /Zs /WX /analyze- /errorReport:foo /nologo /Ob1 /Ob2 -- %s -// RUN: %clang_cl /Zs /WX /Zc:forScope /Zc:wchar_t /wd1234 /RTC1 -- %s +// RUN: %clang_cl /Zs /WX /Zc:forScope /Zc:wchar_t /w12345 /wd1234 /RTC1 -- %s // Support ignoring warnings about unused arguments. // RUN: %clang_cl /Abracadabra -Qunused-arguments -### -- %s 2>&1 | FileCheck -check-prefix=UNUSED %s -- 2.40.0