diff options
| author | Cary Coutant <ccoutant@google.com> | 2013-04-29 17:15:09 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2013-04-29 17:15:09 +0000 |
| commit | e31908b642bf3602c06fe64ab574a865307e45b0 (patch) | |
| tree | 10a5d3ebaad183647e9da9ef874b2fc7fed3aa9a /gold/output.cc | |
| parent | 5dad867ccace0a74c90b729372c9c01392756875 (diff) | |
| download | binutils-gdb-e31908b642bf3602c06fe64ab574a865307e45b0.tar.gz | |
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.
Diffstat (limited to 'gold/output.cc')
| -rw-r--r-- | gold/output.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gold/output.cc b/gold/output.cc index 22c0bf02b56..75ce84093d8 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -2635,11 +2635,6 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx, { bool is_string = (flags & elfcpp::SHF_STRINGS) != 0; - // We only merge strings if the alignment is not more than the - // character size. This could be handled, but it's unusual. - if (is_string && addralign > entsize) - return false; - // We cannot restore merged input section states. gold_assert(this->checkpoint_ == NULL); |