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/merge.h | |
| parent | 5dad867ccace0a74c90b729372c9c01392756875 (diff) | |
| download | fsf-binutils-gdb-e31908b642bf3602c06fe64ab574a865307e45b0.zip fsf-binutils-gdb-e31908b642bf3602c06fe64ab574a865307e45b0.tar.gz fsf-binutils-gdb-e31908b642bf3602c06fe64ab574a865307e45b0.tar.bz2 | |
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/merge.h')
| -rw-r--r-- | gold/merge.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gold/merge.h b/gold/merge.h index 625d731..92c634a 100644 --- a/gold/merge.h +++ b/gold/merge.h @@ -461,10 +461,9 @@ class Output_merge_string : public Output_merge_base { public: Output_merge_string(uint64_t addralign) - : Output_merge_base(sizeof(Char_type), addralign), stringpool_(), + : Output_merge_base(sizeof(Char_type), addralign), stringpool_(addralign), merged_strings_lists_(), input_count_(0), input_size_(0) { - gold_assert(addralign <= sizeof(Char_type)); this->stringpool_.set_no_zero_null(); } |