commit 387fccd8dad1ab16f4d7332e8462b88bcbb2b26e
author David Majnemer <david.majnemer@gmail.com> Mon Feb 29 01:40:30 2016 +0000
committer David Majnemer <david.majnemer@gmail.com> Mon Feb 29 01:40:30 2016 +0000
tree fbce1addcd2348bd18fc5431bba2843d0a9464b2
parent 8b5a7419b85b1043c18b674271425a9f71c1dd1f

[clang-cl] /EHc should not have an effect on /EHa

This matches behavior with MSVC.

llvm-svn: 262197

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index d81b0ae..2841dab 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -5829,12 +5829,16 @@
       switch (EHVal[I]) {
       case 'a':
         EH.Asynch = maybeConsumeDash(EHVal, I);
+        if (EH.Asynch)
+          EH.Synch = false;
         continue;
       case 'c':
         EH.NoUnwindC = maybeConsumeDash(EHVal, I);
         continue;
       case 's':
         EH.Synch = maybeConsumeDash(EHVal, I);
+        if (EH.Synch)
+          EH.Asynch = false;
         continue;
       default:
         break;
@@ -5932,7 +5936,7 @@
   if (EH.Synch || EH.Asynch) {
     CmdArgs.push_back("-fcxx-exceptions");
     CmdArgs.push_back("-fexceptions");
-    if (EH.NoUnwindC)
+    if (EH.Synch && EH.NoUnwindC)
       CmdArgs.push_back("-fexternc-nounwind");
   }