commit 2b4907e73a11794d6f3cc8ca778d1a73a9fbcd04
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 6b8a1fd178b626ea4463068fdf0bf066369443c9
parent 9885f6153ff7eb48ec9b7e36d73d477702290323

Have -fms-no-extensions turn off -fms-compatibility

llvm-svn: 142798

clang/lib/Driver/Tools.cpp

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