ccc: Darwin/X86: gcc compatibility, only add

'-feliminate-unused-debug-symbols' in reponse to '-g' (not '-g*').

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

diff --git a/tools/ccc/ccclib/Arguments.py b/tools/ccc/ccclib/Arguments.py
index 4a7581a7a19d9421ccd13b38b4b6358de3e5c762..075d3b909f4bf1bf7b9ebe9499fa106c318affd4 100644 (file)
--- a/tools/ccc/ccclib/Arguments.py
+++ b/tools/ccc/ccclib/Arguments.py
@@ -721,7 +721,9 @@ class OptionParser:
         self.gstabsOption = self.addOption(JoinedOption('-gstabs', self.gGroup))
         self.g0Option = self.addOption(JoinedOption('-g0', self.gGroup))
         self.g3Option = self.addOption(JoinedOption('-g3', self.gGroup))
-        self.gOption = self.addOption(JoinedOption('-g', self.gGroup))
+        # FIXME: Naming.
+        self.gOption = self.addOption(FlagOption('-g', self.gGroup))
+        self.addOption(JoinedOption('-g', self.gGroup))
 
         # FIXME: How should we handle clang specific options? Do we
         # want to avoid passing them to gcc/cc1 (which will generally

diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index ce87d38255c2f6b802b702d9e726e7ecbb6ba973..da258673ff09470e4f1b577a48f07fd0f77ad1c2 100644 (file)
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -326,7 +326,7 @@ class Darwin_X86_CompileTool(Tool):
         # FIXME: Remove mcpu=G4
         # FIXME: Remove mcpu=G5
 
-        if (arglist.getLastArg(arglist.parser.gGroup) and
+        if (arglist.getLastArg(arglist.parser.gOption) and
             not arglist.getLastArg(arglist.parser.f_noEliminateUnusedDebugSymbolsOption)):
             cmd_args.append('-feliminate-unused-debug-symbols')