This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[gold][patch] Fix merge problem
- From: Rafael Espindola <espindola at google dot com>
- To: Binutils <binutils at sourceware dot org>
- Cc: Ian Lance Taylor <iant at google dot com>, Mikolaj Zalewski <mikolajz at google dot com>
- Date: Thu, 3 Dec 2009 18:31:52 -0500
- Subject: [gold][patch] Fix merge problem
Just noticed a merge problem. The attached patch fixes it.
2009-12-03 Rafael Avila de Espindola <espindola@google.com>
* incremental.cc (Incremental_inputs::sized_create_inputs_section_data):
Don't set the data_offset twice.
Cheers,
--
Rafael Ãvila de EspÃndola
diff --git a/gold/incremental.cc b/gold/incremental.cc
index 63c2f18..bf02834 100644
--- a/gold/incremental.cc
+++ b/gold/incremental.cc
@@ -509,10 +509,6 @@ Incremental_inputs::sized_create_inputs_section_data()
default:
gold_unreachable();
}
- // TODO: add per input data and timestamp. Currently we store
- // an out-of-bounds offset for future version of gold to reject
- // such an incremental_inputs section.
- entry.put_data_offset(0xffffffff);
entry.put_timestamp_sec(it->second.mtime.seconds);
entry.put_timestamp_nsec(it->second.mtime.nanoseconds);
entry.put_input_type(it->second.type);