ccc: Cleanup arguments a bit; we don't need a separate group for

-fblocks, and there were some duplicate options scattered in.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66764 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/ccc/ccclib/Arguments.py b/tools/ccc/ccclib/Arguments.py
index 08cf816d6b30d172c9d11dd307ad00391d787618..c2b61dec29937e5f2150474521613db0ea8f2ad5 100644 (file)
--- a/tools/ccc/ccclib/Arguments.py
+++ b/tools/ccc/ccclib/Arguments.py
@@ -568,7 +568,6 @@ class OptionParser:
         # FIXME: This is broken in Darwin cc1, it wants std* and this
         # is std=. May need an option group for this as well.
         self.stdOption = self.addOption(JoinedOption('-std='))
-        self.addOption(JoinedOrSeparateOption('--sysroot'))
 
         # Blanket pass-through options.
 
@@ -668,8 +667,6 @@ class OptionParser:
         self.addOption(FlagOption('--constant-cfstrings'))
         self.traditionalOption = self.addOption(FlagOption('-traditional'))
         self.traditionalCPPOption = self.addOption(FlagOption('-traditional-cpp'))
-        # FIXME: Alias.
-        self.addOption(FlagOption('--traditional'))
         self.no_dead_strip_inits_and_termsOption = self.addOption(FlagOption('-no_dead_strip_inits_and_terms'))
         self.addOption(JoinedOption('-weak-l', isLinkerInput=True))
         self.addOption(SeparateOption('-weak_framework', isLinkerInput=True))
@@ -794,11 +791,6 @@ class OptionParser:
         # want to avoid passing them to gcc/cc1 (which will generally
         # not eat them), or should we let the user sort it out.
 
-        self.fblocksGroup = OptionGroup('-fblocks')
-        self.f_blocks = self.addOption(FlagOption('-fblocks', self.fblocksGroup))
-        self.f_noblocks = self.addOption(FlagOption('-fno-blocks', self.fblocksGroup))
-        # self.fblocksOption = self.addOption(JoinedOption('-fblocks', self.fblocksGroup))
-        
         self.fGroup = OptionGroup('-f')
         self.Clang_fGroup = OptionGroup('-f', self.fGroup)
         self.fastOption = self.addOption(FlagOption('-fast', self.fGroup))
@@ -806,6 +798,8 @@ class OptionParser:
         self.fastcpOption = self.addOption(FlagOption('-fastcp', self.fGroup))
 
         self.f_appleKextOption = self.addOption(FlagOption('-fapple-kext', self.fGroup))
+        self.f_blocksOption = self.addOption(FlagOption('-fblocks', self.Clang_fGroup))
+        self.f_noBlocksOption = self.addOption(FlagOption('-fno-blocks', self.Clang_fGroup))
         self.f_bootclasspathOption = self.addOption(JoinedOption('-fbootclasspath=', self.fGroup))        
         self.f_classpathOption = self.addOption(JoinedOption('-fclasspath=', self.fGroup))        
         self.f_compileResourceOption = self.addOption(JoinedOption('-fcompile-resource=', self.fGroup))
@@ -972,7 +966,6 @@ class OptionParser:
         self.addOption(FlagOption('--dependencies', alias=self.MOption))
         self.addOption(FlagOption('--entry', alias=self.eOption))
         self.addOption(FlagOption('--extra-warnings', alias=self.WOption))
-        self.addOption(FlagOption('--coverage', alias=self.coverageOption))
         self.addOption(FlagOption('--include-barrier', alias=self.I_Option))
         self.addOption(FlagOption('--no-integrated-cpp', alias=self.noIntegratedCPPOption))
         self.addOption(FlagOption('--no-line-commands', alias=self.POption))

diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index f4b8683837e18d59df6a2121c225a047d956d1bd..5ae8fddf9f0a91ede579bc80595a0e2d3f97ad9a 100644 (file)
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -407,8 +407,6 @@ class Clang_CompileTool(Tool):
                     cmd_args.append(pthPath)
                     break
 
-        arglist.addAllArgs(cmd_args, arglist.parser.fblocksGroup)
-
         # Manually translate -O to -O1; let clang reject others.
         arg = arglist.getLastArg(arglist.parser.OOption)
         if arg:
@@ -567,7 +565,6 @@ class Darwin_X86_CC1Tool(Tool):
         # ccc treats -fsyntax-only specially.
         arglist.addAllArgs2(cmd_args, arglist.parser.fGroup, 
                             arglist.parser.syntaxOnlyOption)
-        arglist.addAllArgs(cmd_args, arglist.parser.fblocksGroup)
 
         arglist.addAllArgs(cmd_args, arglist.parser.undefOption)
         if arglist.getLastArg(arglist.parser.QnOption):
@@ -640,7 +637,6 @@ class Darwin_X86_CC1Tool(Tool):
         # ccc treats -fsyntax-only specially.
         arglist.addAllArgs2(cmd_args, arglist.parser.fGroup, 
                             arglist.parser.syntaxOnlyOption)
-        arglist.addAllArgs(cmd_args, arglist.parser.fblocksGroup)
 
         if (arglist.getLastArg(arglist.parser.gGroup) and
             not arglist.getLastArg(arglist.parser.g0Option) and