[PATCH] gold: when dumping command line to .gnu_incremental_strtab, don't store --incremental-* options

[Mikolaj Zalewski]

A small feature I've forgotten about. We don't want a full relink if
such an option changes and the easiest (and saving some bytes) way is
not to store them in .gnu_incremental_strtab.

2009-05-31  Mikolaj Zalewski  <mikolajz@google.com>

	* incremental.cc (Incremental_inputs::report_command_line): Filter
out --incremental-* options.
-------------- next part --------------
From 1769fb5627d208dbda5fb0c35b457c3ce1c4842e Mon Sep 17 00:00:00 2001
From: Mikolaj Zalewski <mikolajz@puchatek.dom>
Date: Sun, 31 May 2009 23:09:45 +0200
Subject: [PATCH] gold: when dumping command line to .gnu_incremental_strtab, don't store --incremental-* options

---
 gold/incremental.cc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/gold/incremental.cc b/gold/incremental.cc
index 8024551..7d30c37 100644
--- a/gold/incremental.cc
+++ b/gold/incremental.cc
@@ -162,6 +162,12 @@ Incremental_inputs::report_command_line(int argc, const char* const* argv)
   // Copied from collect_argv in main.cc.
   for (int i = 1; i < argc; ++i)
     {
+      // Adding/removing these options should result in a full relink.
+      if (strcmp(argv[i], "--incremental-changed") == 0 ||
+          strcmp(argv[i], "--incremental-unchanged") == 0 ||
+          strcmp(argv[i], "--incremental-unknown") == 0)
+        continue;
+
       args.append(" '");
       // Now append argv[i], but with all single-quotes escaped
       const char* argpos = argv[i];
-- 
1.4.4.2