From 0e02f6ef48a098cc27a250e644415038c2fa52a5 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 21 Apr 2011 17:41:34 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129919 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticDriverKinds.td | 2 -- lib/Driver/ToolChains.cpp | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td index 6397e774f4..edc289f93f 100644 --- a/include/clang/Basic/DiagnosticDriverKinds.td +++ b/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/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 75cb9353aa..c5d34daf2f 100644 --- a/lib/Driver/ToolChains.cpp +++ b/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; -- 2.50.1