aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/incremental.cc6
2 files changed, 11 insertions, 0 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1a5b7fa..c638b8c 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-31 Mikolaj Zalewski <mikolajz@google.com>
+
+ * incremental.cc (Incremental_inputs::report_command_line): Filter
+ out --incremental-* options.
+
2009-05-29 Doug Kwan <dougkwan@google.com>
* gold/arm.cc (Output_data_plt_arm): Forward declaration for new
diff --git a/gold/incremental.cc b/gold/incremental.cc
index 8024551..bb40d31 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];