* merge.h (Output_merge_string::Merged_string): Remove object, shndx,
authorCary Coutant <ccoutant@google.com>
Wed, 21 Jul 2010 21:03:54 +0000 (21:03 +0000)
committerCary Coutant <ccoutant@google.com>
Wed, 21 Jul 2010 21:03:54 +0000 (21:03 +0000)
commit7689733114f888b7f2390ffd2ff2b76fcbf3b8b7
tree5b0eaa53ae83fe433f89180b1fb456ebe98ef1dc
parent23bd0f7c5e23178ccc1c00925813c8e6f17c5eb2
* merge.h (Output_merge_string::Merged_string): Remove object, shndx,
string, and length fields.
(Output_merge_string::Merged_strings_list): New type.
(Output_merge_string::Merged_strings_lists): New typedef.
(Output_merge_string): Replace merged_strings_ with
merged_strings_lists_.
* merge.cc (Output_merge_string::do_add_input_section): Allocate new
Merged_strings_list per input object and section.  Don't store pointer
to the string.  Don't store length with each merged string entry.
(Output_merge_string::finalize_merged_data): Loop over list of merged
strings lists.  Recompute length of each merged string.
gold/ChangeLog
gold/merge.cc
gold/merge.h