commit ba97b6ea0e8933ab801b0d06bba133836627794a
author Douglas Gregor <dgregor@apple.com> Mon Oct 24 15:49:38 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Mon Oct 24 15:49:38 2011 +0000
tree ac8fa563b9246321d94b33e783e26e4345a9246b
parent 0bb935c5e75250f9cab8efa7a95ebdd534c11602

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

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index e6f5b24..42041d6 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1852,8 +1852,12 @@
     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.