clang-cl: make sure we still parse -fms-version= after r213119

The CoreOption flag got lost in the changes.

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

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 1c3f33fbcd8fb88295f8e6b0de1c5a782aaa5d75..f1fc02ec522fb0d2177dca376c4b5214faa954d5 100644 (file)
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -585,7 +585,7 @@ def fms_extensions : Flag<["-"], "fms-extensions">, Group<f_Group>, Flags<[CC1Op
   HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">;
 def fms_compatibility : Flag<["-"], "fms-compatibility">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Enable full Microsoft Visual C++ compatibility">;
-def fmsc_version : Joined<["-"], "fmsc-version=">, Group<f_Group>, Flags<[DriverOption]>,
+def fmsc_version : Joined<["-"], "fmsc-version=">, Group<f_Group>, Flags<[DriverOption, CoreOption]>,
   HelpText<"Microsoft compiler version number to report in _MSC_VER (0 = don't define it (default))">;
 def fms_compatibility_version
     : Joined<["-"], "fms-compatibility-version=">,

diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c
index 6288391f9885d10bbc8ac50b7d178eb6f7943ddd..216f50554239a35496be42dfe65084857c14a81b 100644 (file)
--- a/test/Driver/cl-options.c
+++ b/test/Driver/cl-options.c
@@ -292,5 +292,11 @@
 // RTTI-NOT: "-fno-rtti-data"
 // RTTI-NOT: "-fno-rtti"
 
+// Accept "core" clang options.
+// (/Zs is for syntax-only)
+// RUN: %clang_cl /Zs \
+// RUN:     -fmsc-version=1800 \
+// RUN:     -- %s 2>&1
+
 
 void f() { }