From ba97b6ea0e8933ab801b0d06bba133836627794a Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 24 Oct 2011 15:49:38 +0000 Subject: [PATCH] Have -fms-no-extensions turn off -fms-compatibility git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142798 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index e6f5b24cce..42041d6566 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1852,8 +1852,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-fms-extensions"); // -fms-compatibility=0 is default. - if (Args.hasFlag(options::OPT_fms_compatibility, options::OPT_fno_ms_compatibility, - getToolChain().getTriple().getOS() == llvm::Triple::Win32)) + if (Args.hasFlag(options::OPT_fms_compatibility, + options::OPT_fno_ms_compatibility, + (getToolChain().getTriple().getOS() == llvm::Triple::Win32 && + Args.hasFlag(options::OPT_fms_extensions, + options::OPT_fno_ms_extensions, + true)))) CmdArgs.push_back("-fms-compatibility"); // -fmsc-version=1300 is default. -- 2.50.1