// have been read.
void
-Layout_task_runner::run(Workqueue* workqueue)
+Layout_task_runner::run(Workqueue* workqueue, const Task* task)
{
off_t file_size = this->layout_->finalize(this->input_objects_,
- this->symtab_);
+ this->symtab_,
+ task);
// Now we know the final size of the output file and we know where
// each piece of information goes.
// Layout methods.
Layout::Layout(const General_options& options)
- : options_(options), namepool_(), sympool_(), dynpool_(), signatures_(),
+ : options_(options), entry_(options.entry()), namepool_(), sympool_(),
+ dynpool_(), signatures_(),
section_name_map_(), segment_list_(), section_list_(),
unattached_section_list_(), special_output_list_(),
section_headers_(NULL), tls_segment_(NULL), symtab_section_(NULL),
input_requires_executable_stack_(false),
input_with_gnu_stack_note_(false),
input_without_gnu_stack_note_(false),
- has_static_tls_(false)
+ has_static_tls_(false),
+ any_postprocessing_sections_(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.
// Canonicalize the section name.
Stringpool::Key name_key;
- name = this->namepool_.add_prefix(name, len, &name_key);
+ name = this->namepool_.add_with_length(name, len, true, &name_key);
// Find the output section. The output section is selected based on
// the section name, type, and flags.
// This function returns the size of the output file.
off_t
-Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
+Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab,
+ const Task* task)
{
Target* const target = input_objects->target();
target->finalize_sections(this);
- this->count_local_symbols(input_objects);
+ this->count_local_symbols(task, input_objects);
this->create_gold_note();
this->create_executable_stack_info(target);
// Lay out the file header.
Output_file_header* file_header;
- file_header = new Output_file_header(target, symtab, segment_headers);
+ file_header = new Output_file_header(target, symtab, segment_headers,
+ this->entry_);
load_seg->add_initial_output_data(file_header);
this->special_output_list_.push_back(file_header);
// they contain.
off_t off = this->set_segment_offsets(target, load_seg, &shndx);
+ // Set the file offsets of all the non-data sections we've seen so
+ // far which don't have to wait for the input sections. We need
+ // this in order to finalize local symbols in non-allocated
+ // sections.
+ off = this->set_section_offsets(off, BEFORE_INPUT_SECTIONS_PASS);
+
// Create the symbol table sections.
this->create_symtab_sections(input_objects, symtab, &off);
if (!parameters->doing_static_link())
// Create the .shstrtab section.
Output_section* shstrtab_section = this->create_shstrtab();
- // Set the file offsets of all the non-data sections which don't
- // have to wait for the input sections.
+ // Set the file offsets of the rest of 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.
// Create the section table header.
this->create_shdrs(&off);
+ // If there are no sections which require postprocessing, we can
+ // handle the section names now, and avoid a resize later.
+ if (!this->any_postprocessing_sections_)
+ off = this->set_section_offsets(off,
+ STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS);
+
file_header->set_section_info(this->section_headers_, shstrtab_section);
// Now we know exactly where everything goes in the output file
if (*p == this->symtab_section_)
continue;
+ // If we've already set the data size, don't set it again.
+ if ((*p)->is_offset_valid() && (*p)->is_data_size_valid())
+ continue;
+
if (pass == BEFORE_INPUT_SECTIONS_PASS
&& (*p)->requires_postprocessing())
- (*p)->create_postprocessing_buffer();
+ {
+ (*p)->create_postprocessing_buffer();
+ this->any_postprocessing_sections_ = true;
+ }
if (pass == BEFORE_INPUT_SECTIONS_PASS
&& (*p)->after_input_sections())
continue;
- else if (pass == AFTER_INPUT_SECTIONS_PASS
+ else if (pass == POSTPROCESSING_SECTIONS_PASS
&& (!(*p)->after_input_sections()
|| (*p)->type() == elfcpp::SHT_STRTAB))
continue;
- else if (pass == STRTAB_AFTER_INPUT_SECTIONS_PASS
+ else if (pass == STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS
&& (!(*p)->after_input_sections()
|| (*p)->type() != elfcpp::SHT_STRTAB))
continue;
off += (*p)->data_size();
// At this point the name must be set.
- if (pass != STRTAB_AFTER_INPUT_SECTIONS_PASS)
+ if (pass != STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS)
this->namepool_.add((*p)->name(), false, NULL);
}
return off;
// symbol table, and build the respective string pools.
void
-Layout::count_local_symbols(const Input_objects* input_objects)
+Layout::count_local_symbols(const Task* task,
+ const Input_objects* input_objects)
{
// First, figure out an upper bound on the number of symbols we'll
// be inserting into each pool. This helps us create the pools with
p != input_objects->relobj_end();
++p)
{
- Task_lock_obj<Object> tlo(**p);
+ Task_lock_obj<Object> tlo(task, *p);
(*p)->count_local_symbols(&this->sympool_, &this->dynpool_);
}
}
odyn->add_string(elfcpp::DT_NEEDED, (*p)->soname());
}
+ if (parameters->output_is_shared())
+ {
+ const char* soname = this->options_.soname();
+ if (soname != NULL)
+ odyn->add_string(elfcpp::DT_SONAME, soname);
+ }
+
// FIXME: Support --init and --fini.
Symbol* sym = symtab->lookup("_init");
if (sym != NULL && sym->is_defined() && !sym->is_from_dynobj())
// 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);
-
- // 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_)
+ if (this->any_postprocessing_sections_)
{
- of->resize(off);
- this->output_file_size_ = off;
+ off_t off = this->output_file_size_;
+ off = this->set_section_offsets(off, POSTPROCESSING_SECTIONS_PASS);
+
+ // Now that we've finalized the names, we can finalize the shstrab.
+ off =
+ this->set_section_offsets(off,
+ STRTAB_AFTER_POSTPROCESSING_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)->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);
}
this->namepool_.print_stats("section name pool");
this->sympool_.print_stats("output symbol name pool");
this->dynpool_.print_stats("dynamic name pool");
+
+ for (Section_list::const_iterator p = this->section_list_.begin();
+ p != this->section_list_.end();
+ ++p)
+ (*p)->print_merge_stats();
}
// Write_sections_task methods.
// We can always run this task.
-Task::Is_runnable_type
-Write_sections_task::is_runnable(Workqueue*)
+Task_token*
+Write_sections_task::is_runnable()
{
- return IS_RUNNABLE;
+ return NULL;
}
// We need to unlock both OUTPUT_SECTIONS_BLOCKER and FINAL_BLOCKER
// when finished.
-class Write_sections_task::Write_sections_locker : public Task_locker
-{
- public:
- Write_sections_locker(Task_token& output_sections_blocker,
- Task_token& final_blocker,
- Workqueue* workqueue)
- : output_sections_block_(output_sections_blocker, workqueue),
- final_block_(final_blocker, workqueue)
- { }
-
- private:
- Task_block_token output_sections_block_;
- Task_block_token final_block_;
-};
-
-Task_locker*
-Write_sections_task::locks(Workqueue* workqueue)
+void
+Write_sections_task::locks(Task_locker* tl)
{
- return new Write_sections_locker(*this->output_sections_blocker_,
- *this->final_blocker_,
- workqueue);
+ tl->add(this, this->output_sections_blocker_);
+ tl->add(this, this->final_blocker_);
}
// Run the task--write out the data.
// We can always run this task.
-Task::Is_runnable_type
-Write_data_task::is_runnable(Workqueue*)
+Task_token*
+Write_data_task::is_runnable()
{
- return IS_RUNNABLE;
+ return NULL;
}
// We need to unlock FINAL_BLOCKER when finished.
-Task_locker*
-Write_data_task::locks(Workqueue* workqueue)
+void
+Write_data_task::locks(Task_locker* tl)
{
- return new Task_locker_block(*this->final_blocker_, workqueue);
+ tl->add(this, this->final_blocker_);
}
// Run the task--write out the data.
// We can always run this task.
-Task::Is_runnable_type
-Write_symbols_task::is_runnable(Workqueue*)
+Task_token*
+Write_symbols_task::is_runnable()
{
- return IS_RUNNABLE;
+ return NULL;
}
// We need to unlock FINAL_BLOCKER when finished.
-Task_locker*
-Write_symbols_task::locks(Workqueue* workqueue)
+void
+Write_symbols_task::locks(Task_locker* tl)
{
- return new Task_locker_block(*this->final_blocker_, workqueue);
+ tl->add(this, this->final_blocker_);
}
// Run the task--write out the symbols.
// We can only run this task after the input sections have completed.
-Task::Is_runnable_type
-Write_after_input_sections_task::is_runnable(Workqueue*)
+Task_token*
+Write_after_input_sections_task::is_runnable()
{
if (this->input_sections_blocker_->is_blocked())
- return IS_BLOCKED;
- return IS_RUNNABLE;
+ return this->input_sections_blocker_;
+ return NULL;
}
// We need to unlock FINAL_BLOCKER when finished.
-Task_locker*
-Write_after_input_sections_task::locks(Workqueue* workqueue)
+void
+Write_after_input_sections_task::locks(Task_locker* tl)
{
- return new Task_locker_block(*this->final_blocker_, workqueue);
+ tl->add(this, this->final_blocker_);
}
// Run the task.
// Run the task--close the file.
void
-Close_task_runner::run(Workqueue*)
+Close_task_runner::run(Workqueue*, const Task*)
{
this->of_->close();
}
projects / deliverable / binutils-gdb.git / blobdiff