ccc: Fix passing of -nozero-initialized-in-bss.

 - PR3722.

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

diff --git a/tools/ccc/ccclib/Arguments.py b/tools/ccc/ccclib/Arguments.py
index 78d558b3f1964edacd24b9e233262447dbc38f85..dfba53f68747c13cc811bd6c8b39408e6fbaee8f 100644 (file)
--- a/tools/ccc/ccclib/Arguments.py
+++ b/tools/ccc/ccclib/Arguments.py
@@ -849,6 +849,7 @@ class OptionParser:
         self.f_noUnwindTablesOption = self.addOption(FlagOption('-fno-unwind-tables', self.fGroup))
         self.f_writableStringsOption = self.addOption(FlagOption('-fwritable-strings', self.Clang_fGroup))
         self.f_zeroInitializedInBssOption = self.addOption(FlagOption('-fzero-initialized-in-bss', self.fGroup))
+        self.f_noZeroInitializedInBssOption = self.addOption(FlagOption('-fno-zero-initialized-in-bss', self.fGroup))
         self.fOption = self.addOption(JoinedOption('-f', self.fGroup))
 
         self.coverageOption = self.addOption(FlagOption('-coverage'))

diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index 8e740105fd2806e68ef95450c5d0c1c9314b357f..aabd1753c24ddb590319daf5f073cedbccd1c94b 100644 (file)
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -273,7 +273,9 @@ class Clang_CompileTool(Tool):
             # FIXME: Set --enable-unsafe-fp-math.
             if not arglist.getLastArg(arglist.parser.f_omitFramePointerOption):
                 cmd_args.append('--disable-fp-elim')
-            if not arglist.getLastArg(arglist.parser.f_zeroInitializedInBssOption):
+            if not arglist.hasFFlag(arglist.parser.f_zeroInitializedInBssOption,
+                                    arglist.parser.f_noZeroInitializedInBssOption,
+                                    True):
                 cmd_args.append('--nozero-initialized-in-bss')
             if arglist.getLastArg(arglist.parser.dAOption):
                 cmd_args.append('--asm-verbose')