diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-12-02 05:42:36 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-12-02 05:43:04 -0800 |
| commit | 5f6c22aee74f17393b82934a5682d985672e011a (patch) | |
| tree | fb4a7272b32272ff0b678b1482d61073d55c45d7 /gold/object.h | |
| parent | 3134061ce6e33ade4cc65a36578b94983228815e (diff) | |
| download | gdb-5f6c22aee74f17393b82934a5682d985672e011a.zip gdb-5f6c22aee74f17393b82934a5682d985672e011a.tar.gz gdb-5f6c22aee74f17393b82934a5682d985672e011a.tar.bz2 | |
gold: Get alignment of uncompressed section from ch_addralign
The ELF compression header has a field (ch_addralign) that is set to
the alignment of the uncompressed section. This way the section itself
can have a different alignment than the decompressed section. Update
decompress_input_section to get alignment of the decompressed section
and use it when merging decompressed strings.
PR binutils/23919
* merge.cc (Output_merge_string<Char_type>::do_add_input_section):
Get addralign from decompressed_section_contents.
* object.cc (build_compressed_section_map): Set info.addralign.
(Object::decompressed_section_contents): Add a palign
argument and store p->second.addralign in *palign if it isn't
NULL.
* object.h (Compressed_section_info): Add addralign.
(section_is_compressed): Add a palign argument, default it
to NULL, store p->second.addralign in *palign if it isn't NULL.
(Object::decompressed_section_contents): Likewise.
* output.cc (Output_section::add_input_section): Get addralign
from section_is_compressed.
Diffstat (limited to 'gold/object.h')
| -rw-r--r-- | gold/object.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gold/object.h b/gold/object.h index 0b786a5..b995484 100644 --- a/gold/object.h +++ b/gold/object.h @@ -373,6 +373,7 @@ struct Compressed_section_info { section_size_type size; elfcpp::Elf_Xword flag; + uint64_t addralign; const unsigned char* contents; }; typedef std::map<unsigned int, Compressed_section_info> Compressed_section_map; @@ -808,7 +809,8 @@ class Object bool section_is_compressed(unsigned int shndx, - section_size_type* uncompressed_size) const + section_size_type* uncompressed_size, + elfcpp::Elf_Xword* palign = NULL) const { if (this->compressed_sections_ == NULL) return false; @@ -818,6 +820,8 @@ class Object { if (uncompressed_size != NULL) *uncompressed_size = p->second.size; + if (palign != NULL) + *palign = p->second.addralign; return true; } return false; @@ -828,7 +832,7 @@ class Object // by the caller. const unsigned char* decompressed_section_contents(unsigned int shndx, section_size_type* plen, - bool* is_cached); + bool* is_cached, uint64_t* palign = NULL); // Discard any buffers of decompressed sections. This is done // at the end of the Add_symbols task. |