diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2015-07-12 10:50:25 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2015-07-12 10:50:40 -0700 |
commit | 480586639d6b814b2e87f6f106b8635cf7442b20 (patch) | |
tree | 8fcd160ca3fd8b27770e883a58937c1e50e3bc38 /gold/object.cc | |
parent | 8d6dbeb44ca93b836e3af8f8d3993997bf347112 (diff) | |
download | gdb-480586639d6b814b2e87f6f106b8635cf7442b20.zip gdb-480586639d6b814b2e87f6f106b8635cf7442b20.tar.gz gdb-480586639d6b814b2e87f6f106b8635cf7442b20.tar.bz2 |
Add SHF_COMPRESSED section decompression to gold
This patch adds SHF_COMPRESSED section decompression to gold.
PR gold/18321
* compressed_output.h (decompress_input_section): Add arguments
for ELF class, big endian and sh_flags.
* compressed_output.cc (decompress_input_section): Likewise.
Support the SHF_COMPRESSED section.
* dynobj.h (Dynobj): Add elfsize and is_big_endian member
functions.
* plugin.h (Pluginobj): Likewise.
* layout.cc (Layout::get_output_section_flags): Also clear the
SHF_COMPRESSED bit.
* object.h (Compressed_section_info): Add flag to store sh_flags.
(Object): Add pure virtual elfsize and is_big_endian member
functions.
* object.cc (need_decompressed_section): Don't skip the ".zdebug"
prefix here.
(build_compressed_section_map): Check SHF_COMPRESSED for
uncompressed size. Store sh_flags in Compressed_section_info.
Pass size, big_endian and sh_flags to decompress_input_section.
Skip the ".debug"/".zdebug" prefix when passing section name to
need_decompressed_section.
(Sized_relobj_file<size, big_endian>::do_find_special_section):
Don't check ".zdebug_*" sections.
(Object::decompressed_section_contents): Pass ELF class, big
endian and sh_flags to decompress_input_section.
* reloc.cc (Sized_relobj_file<size, big_endian>::write_sections):
Likewise.
* testsuite/Makefile.am (check_DATA): Add
debug_msg_cdebug_gabi.err and gdb_index_test_2_gabi.stdout.
(MOSTLYCLEANFILES): Add debug_msg_cdebug_gabi.err and
gdb_index_test_2_gabi.stdout.
(debug_msg_cdebug_gabi.o): New.
(odr_violation1_cdebug_gabi.o): Likewise.
(odr_violation2_cdebug_gabi.o): Likewise.
(debug_msg_cdebug_gabi.err): Likewise.
(check_SCRIPTS): Add gdb_index_test_2_gabi.sh.
(gdb_index_test_cdebug_gabi.o): Likewise.
(gdb_index_test_2_gabi): Likewise.
(gdb_index_test_2_gabi.stdout): Likewise.
* testsuite/gdb_index_test_2_gabi.sh: New file.
* testsuite/Makefile.in: Regenerated.
Diffstat (limited to 'gold/object.cc')
-rw-r--r-- | gold/object.cc | 51 |
1 files changed, 35 insertions, 16 deletions
diff --git a/gold/object.cc b/gold/object.cc index 4e94f7e..316f8d4 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -663,14 +663,12 @@ Sized_relobj_file<size, big_endian>::find_eh_frame( // Return TRUE if this is a section whose contents will be needed in the // Add_symbols task. This function is only called for sections that have -// already passed the test in is_compressed_debug_section(), so we know -// that the section name begins with ".zdebug". +// already passed the test in is_compressed_debug_section() and the debug +// section name prefix, ".debug"/".zdebug", has been skipped. static bool need_decompressed_section(const char* name) { - // Skip over the ".zdebug" and a quick check for the "_". - name += 7; if (*name++ != '_') return false; @@ -741,14 +739,33 @@ build_compressed_section_map( } const char* name = names + shdr.get_sh_name(); - if (is_compressed_debug_section(name)) + bool is_compressed = ((shdr.get_sh_flags() + & elfcpp::SHF_COMPRESSED) != 0); + bool is_zcompressed = (!is_compressed + && is_compressed_debug_section(name)); + + if (is_zcompressed || is_compressed) { section_size_type len; const unsigned char* contents = obj->section_contents(i, &len, false); - uint64_t uncompressed_size = get_uncompressed_size(contents, len); + uint64_t uncompressed_size; + if (is_zcompressed) + { + // Skip over the ".zdebug" prefix. + name += 7; + uncompressed_size = get_uncompressed_size(contents, len); + } + else + { + // Skip over the ".debug" prefix. + name += 6; + elfcpp::Chdr<size, big_endian> chdr(contents); + uncompressed_size = chdr.get_ch_size(); + } Compressed_section_info info; info.size = convert_to_section_size_type(uncompressed_size); + info.flag = shdr.get_sh_flags(); info.contents = NULL; if (uncompressed_size != -1ULL) { @@ -758,7 +775,9 @@ build_compressed_section_map( uncompressed_data = new unsigned char[uncompressed_size]; if (decompress_input_section(contents, len, uncompressed_data, - uncompressed_size)) + uncompressed_size, + size, big_endian, + shdr.get_sh_flags())) info.contents = uncompressed_data; else delete[] uncompressed_data; @@ -786,14 +805,11 @@ Sized_relobj_file<size, big_endian>::do_find_special_sections( if (this->find_eh_frame(pshdrs, names, sd->section_names_size)) this->has_eh_frame_ = true; - if (memmem(names, sd->section_names_size, ".zdebug_", 8) != NULL) - { - Compressed_section_map* compressed_sections = - build_compressed_section_map<size, big_endian>( - pshdrs, this->shnum(), names, sd->section_names_size, this, true); - if (compressed_sections != NULL) - this->set_compressed_sections(compressed_sections); - } + Compressed_section_map* compressed_sections = + build_compressed_section_map<size, big_endian>( + pshdrs, this->shnum(), names, sd->section_names_size, this, true); + if (compressed_sections != NULL) + this->set_compressed_sections(compressed_sections); return (this->has_eh_frame_ || (!parameters->options().relocatable() @@ -2899,7 +2915,10 @@ Object::decompressed_section_contents( if (!decompress_input_section(buffer, buffer_size, uncompressed_data, - uncompressed_size)) + uncompressed_size, + elfsize(), + is_big_endian(), + p->second.flag)) this->error(_("could not decompress section %s"), this->do_section_name(shndx).c_str()); |