* merge.h (Output_merge_string::Merged_string): Remove object, shndx,
commit686a0c6e74c967ffbe767556240f74b1d347ccf5
authorCary Coutant <ccoutant@google.com>
Wed, 21 Jul 2010 21:03:54 +0000 (21 21:03 +0000)
committerCary Coutant <ccoutant@google.com>
Wed, 21 Jul 2010 21:03:54 +0000 (21 21:03 +0000)
tree8796184a40dee4eaccd0499358110679f0568bf6
parent8d46e7e7055928b3d6a1b43f69f7eb3d11d4d285
* 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