ccc/Driver: Mark {dump{machine,specs,version},

print-{multi-{directory,lib,os-directory}, search-dirs} as unsupported
instead of handling separately.

llvm-svn: 66848

2 files changed, 7 insertions, 20 deletions

diff --git a/clang/tools/ccc/ccclib/Arguments.py b/clang/tools/ccc/ccclib/Arguments.py
index ec1192ab83a..7451e216b4e 100644
--- a/clang/tools/ccc/ccclib/Arguments.py
+++ b/clang/tools/ccc/ccclib/Arguments.py
@@ -526,16 +526,16 @@ class OptionParser:
 
         # Misc driver options
         self.passExitCodesOption = self.addOption(FlagOption('-pass-exit-codes'))
-        self.dumpspecsOption = self.addOption(FlagOption('-dumpspecs'))
-        self.dumpversionOption = self.addOption(FlagOption('-dumpversion'))
-        self.dumpmachineOption = self.addOption(FlagOption('-dumpmachine'))
-        self.printSearchDirsOption = self.addOption(FlagOption('-print-search-dirs'))
+        self.dumpspecsOption = self.addOption(FlagOption('-dumpspecs', unsupported=True))
+        self.dumpversionOption = self.addOption(FlagOption('-dumpversion', unsupported=True))
+        self.dumpmachineOption = self.addOption(FlagOption('-dumpmachine', unsupported=True))
+        self.printSearchDirsOption = self.addOption(FlagOption('-print-search-dirs', unsupported=True))
         self.printLibgccFileNameOption = self.addOption(FlagOption('-print-libgcc-file-name'))
         self.printFileNameOption = self.addOption(JoinedOption('-print-file-name='))
         self.printProgNameOption = self.addOption(JoinedOption('-print-prog-name='))
-        self.printMultiDirectoryOption = self.addOption(FlagOption('-print-multi-directory'))
-        self.printMultiOsDirectoryOption = self.addOption(FlagOption('-print-multi-os-directory'))
-        self.printMultiLibOption = self.addOption(FlagOption('-print-multi-lib'))
+        self.printMultiDirectoryOption = self.addOption(FlagOption('-print-multi-directory', unsupported=True))
+        self.printMultiOsDirectoryOption = self.addOption(FlagOption('-print-multi-os-directory', unsupported=True))
+        self.printMultiLibOption = self.addOption(FlagOption('-print-multi-lib', unsupported=True))
         self.addOption(SeparateOption('-specs', unsupported=True))
 
         # Pipeline control
diff --git a/clang/tools/ccc/ccclib/Driver.py b/clang/tools/ccc/ccclib/Driver.py
index ffba426cf2a..b18d28bec57 100644
--- a/clang/tools/ccc/ccclib/Driver.py
+++ b/clang/tools/ccc/ccclib/Driver.py
@@ -371,19 +371,6 @@ class Driver(object):
             self.printVersion()
             self.suppressMissingInputWarning = True
 
-        arg = (args.getLastArg(self.parser.dumpmachineOption) or
-               args.getLastArg(self.parser.dumpversionOption) or
-               args.getLastArg(self.parser.printSearchDirsOption))
-        if arg:
-            raise NotImplementedError('%s unsupported' % arg.opt.name)
-
-        arg = (args.getLastArg(self.parser.dumpspecsOption) or
-               args.getLastArg(self.parser.printMultiDirectoryOption) or
-               args.getLastArg(self.parser.printMultiOsDirectoryOption) or
-               args.getLastArg(self.parser.printMultiLibOption))
-        if arg:
-            raise Arguments.InvalidArgumentsError('%s unsupported by this driver' % arg.opt.name)
-
         arg = args.getLastArg(self.parser.printFileNameOption)
         if arg:
             print self.getFilePath(args.getValue(arg))