X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Flayout.cc;h=5f25faea5532b5291d097adbacfb52b0a24abafb;hb=73b9be8b5301c4ac056e10c38a47414867ee892a;hp=de0384b8f45b9f594bc6a636bf9f66420b6818ea;hpb=412ffd830b94a860e81e8515140ba5ebc5aa82be;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/layout.cc b/gold/layout.cc index de0384b8f4..5f25faea55 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -1,6 +1,6 @@ // layout.cc -- lay out output file sections for gold -// Copyright (C) 2006-2016 Free Software Foundation, Inc. +// Copyright (C) 2006-2017 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -1581,6 +1581,23 @@ Layout::add_eh_frame_for_plt(Output_data* plt, const unsigned char* cie_data, } } +// Remove .eh_frame information for a PLT. FDEs using the CIE must +// be removed in reverse order to the order they were added. + +void +Layout::remove_eh_frame_for_plt(Output_data* plt, const unsigned char* cie_data, + size_t cie_length, const unsigned char* fde_data, + size_t fde_length) +{ + if (parameters->incremental()) + { + // FIXME: Maybe this could work some day.... + return; + } + this->eh_frame_data_->remove_ehframe_for_plt(plt, cie_data, cie_length, + fde_data, fde_length); +} + // Scan a .debug_info or .debug_types section, and add summary // information to the .gdb_index section. @@ -2696,6 +2713,9 @@ off_t Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab, Target* target, const Task* task) { + unsigned int local_dynamic_count = 0; + unsigned int forced_local_dynamic_count = 0; + target->finalize_sections(this, input_objects, symtab); this->count_local_symbols(task, input_objects); @@ -2716,11 +2736,12 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab, // Create the dynamic symbol table, including the hash table. Output_section* dynstr; std::vector dynamic_symbols; - unsigned int local_dynamic_count; Versions versions(*this->script_options()->version_script_info(), &this->dynpool_); this->create_dynamic_symtab(input_objects, symtab, &dynstr, - &local_dynamic_count, &dynamic_symbols, + &local_dynamic_count, + &forced_local_dynamic_count, + &dynamic_symbols, &versions); // Create the .interp section to hold the name of the @@ -2741,7 +2762,9 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab, // Create the version sections. We can't do this until the // dynamic string table is complete. - this->create_version_sections(&versions, symtab, local_dynamic_count, + this->create_version_sections(&versions, symtab, + (local_dynamic_count + + forced_local_dynamic_count), dynamic_symbols, dynstr); // Set the size of the _DYNAMIC symbol. We can't do this until @@ -2811,7 +2834,8 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab, shndx = this->set_section_indexes(shndx); // Create the symbol table sections. - this->create_symtab_sections(input_objects, symtab, shndx, &off); + this->create_symtab_sections(input_objects, symtab, shndx, &off, + local_dynamic_count); if (!parameters->doing_static_link()) this->assign_local_dynsym_offsets(input_objects); @@ -3293,6 +3317,11 @@ bool Layout::segment_precedes(const Output_segment* seg1, const Output_segment* seg2) { + // In order to produce a stable ordering if we're called with the same pointer + // return false. + if (seg1 == seg2) + return false; + elfcpp::Elf_Word type1 = seg1->type(); elfcpp::Elf_Word type2 = seg2->type(); @@ -3452,7 +3481,7 @@ is_text_segment(const Target* target, const Output_segment* seg) } // Set the file offsets of all the segments, and all the sections they -// contain. They have all been created. LOAD_SEG must be be laid out +// contain. They have all been created. LOAD_SEG must be laid out // first. Return the offset of the data to follow. off_t @@ -3999,7 +4028,8 @@ void Layout::create_symtab_sections(const Input_objects* input_objects, Symbol_table* symtab, unsigned int shnum, - off_t* poff) + off_t* poff, + unsigned int local_dynamic_count) { int symsize; unsigned int align; @@ -4053,18 +4083,15 @@ Layout::create_symtab_sections(const Input_objects* input_objects, gold_assert(static_cast(local_symcount * symsize) == off); off_t dynoff; - size_t dyn_global_index; size_t dyncount; if (this->dynsym_section_ == NULL) { dynoff = 0; - dyn_global_index = 0; dyncount = 0; } else { - dyn_global_index = this->dynsym_section_->info(); - off_t locsize = dyn_global_index * this->dynsym_section_->entsize(); + off_t locsize = local_dynamic_count * this->dynsym_section_->entsize(); dynoff = this->dynsym_section_->offset() + locsize; dyncount = (this->dynsym_section_->data_size() - locsize) / symsize; gold_assert(static_cast(dyncount * symsize) @@ -4072,7 +4099,7 @@ Layout::create_symtab_sections(const Input_objects* input_objects, } off_t global_off = off; - off = symtab->finalize(off, dynoff, dyn_global_index, dyncount, + off = symtab->finalize(off, dynoff, local_dynamic_count, dyncount, &this->sympool_, &local_symcount); if (!parameters->options().strip_all()) @@ -4238,12 +4265,18 @@ Layout::allocated_output_section_count() const } // Create the dynamic symbol table. +// *PLOCAL_DYNAMIC_COUNT will be set to the number of local symbols +// from input objects, and *PFORCED_LOCAL_DYNAMIC_COUNT will be set +// to the number of global symbols that have been forced local. +// We need to remember the former because the forced-local symbols are +// written along with the global symbols in Symtab::write_globals(). void Layout::create_dynamic_symtab(const Input_objects* input_objects, Symbol_table* symtab, Output_section** pdynstr, unsigned int* plocal_dynamic_count, + unsigned int* pforced_local_dynamic_count, std::vector* pdynamic_symbols, Versions* pversions) { @@ -4278,10 +4311,14 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects, } unsigned int local_symcount = index; - *plocal_dynamic_count = local_symcount; + unsigned int forced_local_count = 0; - index = symtab->set_dynsym_indexes(index, pdynamic_symbols, - &this->dynpool_, pversions); + index = symtab->set_dynsym_indexes(index, &forced_local_count, + pdynamic_symbols, &this->dynpool_, + pversions); + + *plocal_dynamic_count = local_symcount; + *pforced_local_dynamic_count = forced_local_count; int symsize; unsigned int align; @@ -4316,7 +4353,7 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects, "** dynsym"); dynsym->add_output_section_data(odata); - dynsym->set_info(local_symcount); + dynsym->set_info(local_symcount + forced_local_count); dynsym->set_entsize(symsize); dynsym->set_addralign(align); @@ -4400,7 +4437,8 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects, { unsigned char* phash; unsigned int hashlen; - Dynobj::create_gnu_hash_table(*pdynamic_symbols, local_symcount, + Dynobj::create_gnu_hash_table(*pdynamic_symbols, + local_symcount + forced_local_count, &phash, &hashlen); Output_section* hashsec = @@ -4437,7 +4475,8 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects, { unsigned char* phash; unsigned int hashlen; - Dynobj::create_elf_hash_table(*pdynamic_symbols, local_symcount, + Dynobj::create_elf_hash_table(*pdynamic_symbols, + local_symcount + forced_local_count, &phash, &hashlen); Output_section* hashsec =