Driver: Tweak -Xarch diags a bit more, we can't actually differentiate between

unknown and "required more arguments", but only the latter should be feasible in
practice.

llvm-svn: 129919

2 files changed, 1 insertions, 7 deletions

diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td
index 6397e774f4a..edc289f93fd 100644
--- a/clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -39,8 +39,6 @@ def err_drv_invalid_darwin_version : Error<
   "invalid Darwin version number: %0">;
 def err_drv_missing_argument : Error<
   "argument to '%0' is missing (expected %1 %plural{1:value|:values}1)">;
-def err_drv_invalid_Xarch_argument_unknown : Error<
-  "invalid Xarch argument: '%0', option is unrecognized">;
 def err_drv_invalid_Xarch_argument_with_args : Error<
   "invalid Xarch argument: '%0', options requiring arguments are unsupported">;
 def err_drv_invalid_Xarch_argument_isdriver : Error<
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 75cb9353aa0..c5d34daf2f3 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -555,11 +555,7 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args,
       // driver behavior; that isn't going to work in our model. We
       // use isDriverOption() as an approximation, although things
       // like -O4 are going to slip through.
-      if (!XarchArg) {
-        getDriver().Diag(clang::diag::err_drv_invalid_Xarch_argument_unknown)
-          << A->getAsString(Args);
-        continue;
-      } else if (Index > Prev + 1) {
+      if (!XarchArg || Index > Prev + 1) {
         getDriver().Diag(clang::diag::err_drv_invalid_Xarch_argument_with_args)
           << A->getAsString(Args);
         continue;