1 files changed, 21 insertions, 18 deletions

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 96971e91ae6..d8c83742495 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -280,8 +280,9 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const {
   }
 
   // Enforce -static if -miamcu is present.
-  if (Args.hasArg(options::OPT_miamcu))
-    DAL->AddFlagArg(0, Opts->getOption(options::OPT_static));
+  if (Arg *Ar = Args.getLastArg(options::OPT_miamcu, options::OPT_mno_iamcu))
+    if (Ar->getOption().matches(options::OPT_miamcu))
+      DAL->AddFlagArg(0, Opts->getOption(options::OPT_static));
 
 // Add a default value of -mlinker-version=, if one was given and the user
 // didn't specify one.
@@ -375,22 +376,24 @@ static llvm::Triple computeTargetTriple(const Driver &D,
   }
 
   // Handle -miamcu flag.
-  if (Args.hasArg(options::OPT_miamcu)) {
-    if (Target.get32BitArchVariant().getArch() != llvm::Triple::x86)
-      D.Diag(diag::err_drv_unsupported_opt_for_target) << "-miamcu"
-                                                       << Target.str();
-
-    if (A && !A->getOption().matches(options::OPT_m32))
-      D.Diag(diag::err_drv_argument_not_allowed_with)
-          << "-miamcu" << A->getBaseArg().getAsString(Args);
-
-    Target.setArch(llvm::Triple::x86);
-    Target.setArchName("i586");
-    Target.setEnvironment(llvm::Triple::UnknownEnvironment);
-    Target.setEnvironmentName("");
-    Target.setOS(llvm::Triple::ELFIAMCU);
-    Target.setVendor(llvm::Triple::UnknownVendor);
-    Target.setVendorName("intel");
+  if (Arg *Ar = Args.getLastArg(options::OPT_miamcu, options::OPT_mno_iamcu)) {
+    if (Ar->getOption().matches(options::OPT_miamcu)) {
+      if (Target.get32BitArchVariant().getArch() != llvm::Triple::x86)
+        D.Diag(diag::err_drv_unsupported_opt_for_target) << "-miamcu"
+                                                         << Target.str();
+
+      if (A && !A->getOption().matches(options::OPT_m32))
+        D.Diag(diag::err_drv_argument_not_allowed_with)
+            << "-miamcu" << A->getBaseArg().getAsString(Args);
+
+      Target.setArch(llvm::Triple::x86);
+      Target.setArchName("i586");
+      Target.setEnvironment(llvm::Triple::UnknownEnvironment);
+      Target.setEnvironmentName("");
+      Target.setOS(llvm::Triple::ELFIAMCU);
+      Target.setVendor(llvm::Triple::UnknownVendor);
+      Target.setVendorName("intel");
+    }
   }
 
   return Target;