* output.cc (Output_section::add_input_section): Don't try to

merge empty merge sections.
This commit is contained in:
Ian Lance Taylor 2008-07-22 08:09:48 +00:00
parent bda987c255
commit e0b640329e
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2008-07-22 Ian Lance Taylor <iant@google.com>
* output.cc (Output_section::add_input_section): Don't try to
merge empty merge sections.
2008-07-21 Craig Silverstein <csilvers@google.com>
* symtab.cc (Symbol_table::warn_about_undefined_dynobj_symbol):

View File

@ -1819,9 +1819,11 @@ Output_section::add_input_section(Sized_relobj<size, big_endian>* object,
// If this is a SHF_MERGE section, we pass all the input sections to
// a Output_data_merge. We don't try to handle relocations for such
// a section.
// a section. We don't try to handle empty merge sections--they
// mess up the mappings, and are useless anyhow.
if ((sh_flags & elfcpp::SHF_MERGE) != 0
&& reloc_shndx == 0)
&& reloc_shndx == 0
&& shdr.get_sh_size() > 0)
{
if (this->add_merge_input_section(object, shndx, sh_flags,
entsize, addralign))