diff options
| author | Hans Wennborg <hans@hanshq.net> | 2014-07-16 16:03:56 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2014-07-16 16:03:56 +0000 |
| commit | 8a7c47ff975434e4d415588ea81e88c704ee8f25 (patch) | |
| tree | b5115a9d32dc7811b761797af670aab439c6fd9e /clang | |
| parent | f52c88f0150dcbd1b8de361ee3227221ad7a9b75 (diff) | |
| download | bcm5719-llvm-8a7c47ff975434e4d415588ea81e88c704ee8f25.tar.gz bcm5719-llvm-8a7c47ff975434e4d415588ea81e88c704ee8f25.zip | |
clang-cl: make sure we still parse -fms-version= after r213119
The CoreOption flag got lost in the changes.
llvm-svn: 213164
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 2 | ||||
| -rw-r--r-- | clang/test/Driver/cl-options.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 1c3f33fbcd8..f1fc02ec522 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/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/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 6288391f988..216f5055423 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/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() { } |
