: options_(options), namepool_(), sympool_(), dynpool_(), signatures_(),
section_name_map_(), segment_list_(), section_list_(),
unattached_section_list_(), special_output_list_(),
- tls_segment_(NULL), symtab_section_(NULL),
+ section_headers_(NULL), tls_segment_(NULL), symtab_section_(NULL),
dynsym_section_(NULL), dynamic_section_(NULL), dynamic_data_(NULL),
eh_frame_section_(NULL), output_file_size_(-1),
input_requires_executable_stack_(false),
input_with_gnu_stack_note_(false),
- input_without_gnu_stack_note_(false),
- have_textrel_(false)
+ input_without_gnu_stack_note_(false)
{
// Make space for more than enough segments for a typical file.
// This is just for efficiency--it's OK if we wind up needing more.
this->segment_list_.reserve(12);
- // We expect three unattached Output_data objects: the file header,
- // the segment headers, and the section headers.
- this->special_output_list_.reserve(3);
+ // We expect two unattached Output_data objects: the file header and
+ // the segment headers.
+ this->special_output_list_.reserve(2);
}
// Hash a key we use to look up an output section mapping.
return strncmp(prefix, str, strlen(prefix)) == 0;
}
+// Returns whether the given section is in the list of
+// debug-sections-used-by-some-version-of-gdb. Currently,
+// we've checked versions of gdb up to and including 6.7.1.
+
+static const char* gdb_sections[] =
+{ ".debug_abbrev",
+ // ".debug_aranges", // not used by gdb as of 6.7.1
+ ".debug_frame",
+ ".debug_info",
+ ".debug_line",
+ ".debug_loc",
+ ".debug_macinfo",
+ // ".debug_pubnames", // not used by gdb as of 6.7.1
+ ".debug_ranges",
+ ".debug_str",
+};
+
+static inline bool
+is_gdb_debug_section(const char* str)
+{
+ // We can do this faster: binary search or a hashtable. But why bother?
+ for (size_t i = 0; i < sizeof(gdb_sections)/sizeof(*gdb_sections); ++i)
+ if (strcmp(str, gdb_sections[i]) == 0)
+ return true;
+ return false;
+}
+
// Whether to include this section in the link.
template<int size, bool big_endian>
|| is_prefix_of(".stab", name))
return false;
}
+ if (parameters->strip_debug_gdb()
+ && (shdr.get_sh_flags() & elfcpp::SHF_ALLOC) == 0)
+ {
+ // Debugging sections can only be recognized by name.
+ if (is_prefix_of(".debug", name)
+ && !is_gdb_debug_section(name))
+ return false;
+ }
return true;
default:
Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
elfcpp::Elf_Xword flags)
{
- Output_section* os = new Output_section(name, type, flags);
+ Output_section* os = new Output_section(this->options_, name, type, flags);
this->section_list_.push_back(os);
if ((flags & elfcpp::SHF_ALLOC) == 0)
this->special_output_list_.push_back(file_header);
// We set the output section indexes in set_segment_offsets and
- // set_section_offsets.
+ // set_section_indexes.
unsigned int shndx = 1;
// Set the file offsets of all the segments, and all the sections
// they contain.
off_t off = this->set_segment_offsets(target, load_seg, &shndx);
- // Set the file offsets of all the data sections not associated with
- // segments. This makes sure that debug sections have their offsets
- // before symbols are finalized.
- off = this->set_section_offsets(off, true);
-
// Create the symbol table sections.
this->create_symtab_sections(input_objects, symtab, &off);
// Create the .shstrtab section.
Output_section* shstrtab_section = this->create_shstrtab();
- // Set the file offsets of all the non-data sections not associated with
- // segments.
- off = this->set_section_offsets(off, false);
+ // Set the file offsets of all the non-data sections which don't
+ // have to wait for the input sections.
+ off = this->set_section_offsets(off, BEFORE_INPUT_SECTIONS_PASS);
// Now that all sections have been created, set the section indexes.
shndx = this->set_section_indexes(shndx);
// Create the section table header.
- Output_section_headers* oshdrs = this->create_shdrs(&off);
+ this->create_shdrs(&off);
- file_header->set_section_info(oshdrs, shstrtab_section);
+ file_header->set_section_info(this->section_headers_, shstrtab_section);
- // Now we know exactly where everything goes in the output file.
+ // Now we know exactly where everything goes in the output file
+ // (except for non-allocated sections which require postprocessing).
Output_data::layout_complete();
this->output_file_size_ = off;
// segment.
off_t
-Layout::set_section_offsets(off_t off,
- bool do_bits_sections)
+Layout::set_section_offsets(off_t off, Layout::Section_offset_pass pass)
{
for (Section_list::iterator p = this->unattached_section_list_.begin();
p != this->unattached_section_list_.end();
++p)
{
- bool is_bits_section = ((*p)->type() == elfcpp::SHT_PROGBITS
- || (*p)->type() == elfcpp::SHT_NOBITS);
- if (is_bits_section != do_bits_sections)
- continue;
- if ((*p)->offset() != -1)
+ // The symtab section is handled in create_symtab_sections.
+ if (*p == this->symtab_section_)
continue;
+
+ if (pass == BEFORE_INPUT_SECTIONS_PASS
+ && (*p)->after_input_sections())
+ continue;
+ else if (pass == AFTER_INPUT_SECTIONS_PASS
+ && (!(*p)->after_input_sections()
+ || (*p)->type() == elfcpp::SHT_STRTAB))
+ continue;
+ else if (pass == STRTAB_AFTER_INPUT_SECTIONS_PASS
+ && (!(*p)->after_input_sections()
+ || (*p)->type() != elfcpp::SHT_STRTAB))
+ continue;
+
off = align_address(off, (*p)->addralign());
- (*p)->set_address(0, off);
+ (*p)->set_file_offset(off);
+ (*p)->finalize_data_size();
off += (*p)->data_size();
}
return off;
}
+// Allow any section not associated with a segment to change its
+// output section name at the last minute.
+
+void
+Layout::modify_section_names()
+{
+ for (Section_list::iterator p = this->unattached_section_list_.begin();
+ p != this->unattached_section_list_.end();
+ ++p)
+ if ((*p)->maybe_modify_output_section_name())
+ this->namepool_.add((*p)->name(), true, NULL);
+}
+
// Set the section indexes of all the sections not associated with a
// segment.
0);
this->symtab_section_ = osymtab;
- Output_section_data* pos = new Output_data_space(off - startoff,
- align);
+ Output_section_data* pos = new Output_data_fixed_space(off - startoff,
+ align);
osymtab->add_output_section_data(pos);
const char* strtab_name = this->namepool_.add(".strtab", false, NULL);
Output_section_data* pstr = new Output_data_strtab(&this->sympool_);
ostrtab->add_output_section_data(pstr);
- osymtab->set_address(0, startoff);
+ osymtab->set_file_offset(startoff);
+ osymtab->finalize_data_size();
osymtab->set_link_section(ostrtab);
osymtab->set_info(local_symcount);
osymtab->set_entsize(symsize);
const char* name = this->namepool_.add(".shstrtab", false, NULL);
- this->namepool_.set_string_offsets();
-
Output_section* os = this->make_output_section(name, elfcpp::SHT_STRTAB, 0);
+ // We can't write out this section until we've set all the section
+ // names, and we don't set the names of compressed output sections
+ // until relocations are complete.
+ os->set_after_input_sections();
+
Output_section_data* posd = new Output_data_strtab(&this->namepool_);
os->add_output_section_data(posd);
// Create the section headers. SIZE is 32 or 64. OFF is the file
// offset.
-Output_section_headers*
+void
Layout::create_shdrs(off_t* poff)
{
Output_section_headers* oshdrs;
&this->unattached_section_list_,
&this->namepool_);
off_t off = align_address(*poff, oshdrs->addralign());
- oshdrs->set_address(0, off);
+ oshdrs->set_address_and_file_offset(0, off);
off += oshdrs->data_size();
*poff = off;
- this->special_output_list_.push_back(oshdrs);
- return oshdrs;
+ this->section_headers_ = oshdrs;
}
// Create the dynamic symbol table.
elfcpp::SHT_DYNSYM,
elfcpp::SHF_ALLOC);
- Output_section_data* odata = new Output_data_space(index * symsize,
- align);
+ Output_section_data* odata = new Output_data_fixed_space(index * symsize,
+ align);
dynsym->add_output_section_data(odata);
dynsym->set_info(local_symcount);
odyn->add_string(elfcpp::DT_RPATH, rpath_val);
}
-
- // Add a DT_FLAGS entry. We add it even if no flags are set so that
- // post-link tools can easily modify these flags if desired.
- unsigned int flags = 0;
- if (this->have_textrel_)
- flags |= elfcpp::DF_TEXTREL;
- odyn->add_constant(elfcpp::DT_FLAGS, flags);
+
+ // Look for text segments that have dynamic relocations.
+ bool have_textrel = false;
+ for (Segment_list::const_iterator p = this->segment_list_.begin();
+ p != this->segment_list_.end();
+ ++p)
+ {
+ if (((*p)->flags() & elfcpp::PF_W) == 0
+ && (*p)->dynamic_reloc_count() > 0)
+ {
+ have_textrel = true;
+ break;
+ }
+ }
+
+ // Add a DT_FLAGS entry. We add it even if no flags are set so that
+ // post-link tools can easily modify these flags if desired.
+ unsigned int flags = 0;
+ if (have_textrel)
+ flags |= elfcpp::DF_TEXTREL;
+ odyn->add_constant(elfcpp::DT_FLAGS, flags);
}
// The mapping of .gnu.linkonce section names to real section names.
// input sections are complete.
void
-Layout::write_sections_after_input_sections(Output_file* of) const
+Layout::write_sections_after_input_sections(Output_file* of)
{
+ // Determine the final section offsets, and thus the final output
+ // file size. Note we finalize the .shstrab last, to allow the
+ // after_input_section sections to modify their section-names before
+ // writing.
+ off_t off = this->output_file_size_;
+ off = this->set_section_offsets(off, AFTER_INPUT_SECTIONS_PASS);
+
+ // Determine the final section names as well (at least, for sections
+ // that we haven't written yet).
+ this->modify_section_names();
+
+ // Now that we've finalized the names, we can finalize the shstrab.
+ off = this->set_section_offsets(off, STRTAB_AFTER_INPUT_SECTIONS_PASS);
+
+ if (off > this->output_file_size_)
+ {
+ of->resize(off);
+ this->output_file_size_ = off;
+ }
+
for (Section_list::const_iterator p = this->section_list_.begin();
p != this->section_list_.end();
++p)
if ((*p)->after_input_sections())
(*p)->write(of);
}
+
+ for (Section_list::const_iterator p = this->unattached_section_list_.begin();
+ p != this->unattached_section_list_.end();
+ ++p)
+ {
+ if ((*p)->after_input_sections())
+ (*p)->write(of);
+ }
+
+ this->section_headers_->write(of);
}
// Write_sections_task methods.
projects / deliverable / binutils-gdb.git / blobdiff