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

[Hans Wennborg]

Author: hans
Date: Wed Jul 16 11:03:56 2014
New Revision: 213164

URL: http://llvm.org/viewvc/llvm-project?rev=213164&view=rev
Log:
clang-cl: make sure we still parse -fms-version= after r213119

The CoreOption flag got lost in the changes.

Modified:
    cfe/trunk/include/clang/Driver/Options.td
    cfe/trunk/test/Driver/cl-options.c

Modified: cfe/trunk/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=213164&r1=213163&r2=213164&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Wed Jul 16 11:03:56 2014
@@ -585,7 +585,7 @@ def fms_extensions : Flag<["-"], "fms-ex
   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=">,

Modified: cfe/trunk/test/Driver/cl-options.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cl-options.c?rev=213164&r1=213163&r2=213164&view=diff
==============================================================================
--- cfe/trunk/test/Driver/cl-options.c (original)
+++ cfe/trunk/test/Driver/cl-options.c Wed Jul 16 11:03:56 2014
@@ -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() { }