From 0b8edfdb365bdd1108be2deb0e48b47ce10b92b5 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Wed, 16 Jul 2014 16:03:56 +0000 Subject: [PATCH] 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 --- include/clang/Driver/Options.td | 2 +- test/Driver/cl-options.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index 1c3f33fbcd..f1fc02ec52 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -585,7 +585,7 @@ def fms_extensions : Flag<["-"], "fms-extensions">, Group, Flags<[CC1Op HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">; def fms_compatibility : Flag<["-"], "fms-compatibility">, Group, Flags<[CC1Option]>, HelpText<"Enable full Microsoft Visual C++ compatibility">; -def fmsc_version : Joined<["-"], "fmsc-version=">, Group, Flags<[DriverOption]>, +def fmsc_version : Joined<["-"], "fmsc-version=">, 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 6288391f98..216f505542 100644 --- 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() { } -- 2.50.1