diff options
| author | Ian Lance Taylor <iant@google.com> | 2007-11-19 22:49:38 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2007-11-19 22:49:38 +0000 |
| commit | 44a43cf96f7eb1b8ee973744e8788e582a9c7b8d (patch) | |
| tree | 80c2a8a5b243e346247207f0e6771ef0e18ff207 /gold | |
| parent | b224e962a8c9617f9b04f07393c70776b8edb9b2 (diff) | |
| download | gdb-44a43cf96f7eb1b8ee973744e8788e582a9c7b8d.zip gdb-44a43cf96f7eb1b8ee973744e8788e582a9c7b8d.tar.gz gdb-44a43cf96f7eb1b8ee973744e8788e582a9c7b8d.tar.bz2 | |
From Craig Silverstein: Force .debug_str sections to be SHF_MERGE and
SHF_STRINGS.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/output.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gold/output.cc b/gold/output.cc index 5832ded..5e9758b 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1113,13 +1113,20 @@ Output_section::add_input_section(Sized_relobj<size, big_endian>* object, if (addralign > this->addralign_) this->addralign_ = addralign; + typename elfcpp::Elf_types<size>::Elf_WXword sh_flags = shdr.get_sh_flags(); + + // .debug_str is a mergeable string section, but is not always so + // marked by compilers. Mark manually here so we can optimize. + if (strcmp(secname, ".debug_str") == 0) + sh_flags |= (elfcpp::SHF_MERGE | elfcpp::SHF_STRINGS); + // 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. - if ((shdr.get_sh_flags() & elfcpp::SHF_MERGE) != 0 + if ((sh_flags & elfcpp::SHF_MERGE) != 0 && reloc_shndx == 0) { - if (this->add_merge_input_section(object, shndx, shdr.get_sh_flags(), + if (this->add_merge_input_section(object, shndx, sh_flags, shdr.get_sh_entsize(), addralign)) { @@ -1134,7 +1141,7 @@ Output_section::add_input_section(Sized_relobj<size, big_endian>* object, addralign); if (aligned_offset_in_section > offset_in_section - && (shdr.get_sh_flags() & elfcpp::SHF_EXECINSTR) != 0 + && (sh_flags & elfcpp::SHF_EXECINSTR) != 0 && object->target()->has_code_fill()) { // We need to add some fill data. Using fill_list_ when |