2013-04-29 Alexander Ivchenko <alexander.ivchenko@intel.com>
authorCary Coutant <ccoutant@google.com>
Mon, 29 Apr 2013 17:15:09 +0000 (17:15 +0000)
committerCary Coutant <ccoutant@google.com>
Mon, 29 Apr 2013 17:15:09 +0000 (17:15 +0000)
commite31908b642bf3602c06fe64ab574a865307e45b0
tree10a5d3ebaad183647e9da9ef874b2fc7fed3aa9a
parent5dad867ccace0a74c90b729372c9c01392756875
2013-04-29  Alexander Ivchenko  <alexander.ivchenko@intel.com>

gold/
* output.cc (Output_section::add_merge_input_section): Allow
to merge sections if the alignment is more than character size.
* merge.h (Output_merge_string::Output_merge_string): Remove
assert.
* merge.cc (Output_merge_string<Char_type>::do_add_input_section): Count
only not-null strings. Check the alignment of strings.
* stringpool.h
(Stringpool_template<Stringpool_char>::Stringpool_template): Add
alignment as the argument.
(Stringpool_template<Stringpool_char>::addralign_): New class member.
* stringpool.cc (Stringpool_template<Stringpool_char>::new_key_offset):
Align non-zero length strings according to the addralign_.
(Stringpool_template<Stringpool_char>::set_string_offsets):
Updating offsets according to the given alignment.
* testsuite/Makefile.am (text_section_grouping): Test if string
literals are getting merged.
* testsuite/Makefile.in: Regenerate.
* testsuite/merge_string_literals_1.c: New file.
* testsuite/merge_string_literals_2.c: Ditto.
* testsuite/merge_string_literals.sh: Ditto.
gold/ChangeLog
gold/merge.cc
gold/merge.h
gold/output.cc
gold/stringpool.cc
gold/stringpool.h
gold/testsuite/Makefile.am
gold/testsuite/Makefile.in
gold/testsuite/merge_string_literals.sh [new file with mode: 0755]
gold/testsuite/merge_string_literals_1.c [new file with mode: 0644]
gold/testsuite/merge_string_literals_2.c [new file with mode: 0644]