2007-05-16 19:42:48 +02:00
|
|
|
// merge.cc -- handle section merging for gold
|
|
|
|
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 00:05:01 +02:00
|
|
|
// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
2007-09-22 23:02:10 +02:00
|
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
|
|
|
|
// This file is part of gold.
|
|
|
|
|
|
|
|
// This program is free software; you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
|
|
// along with this program; if not, write to the Free Software
|
|
|
|
// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
// MA 02110-1301, USA.
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
#include "gold.h"
|
|
|
|
|
|
|
|
#include <cstdlib>
|
2007-10-18 19:46:23 +02:00
|
|
|
#include <algorithm>
|
2007-05-16 19:42:48 +02:00
|
|
|
|
|
|
|
#include "merge.h"
|
2010-07-12 19:59:58 +02:00
|
|
|
#include "compressed_output.h"
|
2007-05-16 19:42:48 +02:00
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
2007-12-21 22:19:45 +01:00
|
|
|
// Class Object_merge_map.
|
2007-11-27 07:13:33 +01:00
|
|
|
|
|
|
|
// Destructor.
|
|
|
|
|
|
|
|
Object_merge_map::~Object_merge_map()
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
2007-11-27 07:13:33 +01:00
|
|
|
for (Section_merge_maps::iterator p = this->section_merge_maps_.begin();
|
|
|
|
p != this->section_merge_maps_.end();
|
|
|
|
++p)
|
|
|
|
delete p->second;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the Input_merge_map to use for an input section, or NULL.
|
|
|
|
|
|
|
|
Object_merge_map::Input_merge_map*
|
|
|
|
Object_merge_map::get_input_merge_map(unsigned int shndx)
|
|
|
|
{
|
|
|
|
gold_assert(shndx != -1U);
|
|
|
|
if (shndx == this->first_shnum_)
|
|
|
|
return &this->first_map_;
|
|
|
|
if (shndx == this->second_shnum_)
|
|
|
|
return &this->second_map_;
|
|
|
|
Section_merge_maps::const_iterator p = this->section_merge_maps_.find(shndx);
|
|
|
|
if (p != this->section_merge_maps_.end())
|
|
|
|
return p->second;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get or create the Input_merge_map to use for an input section.
|
|
|
|
|
|
|
|
Object_merge_map::Input_merge_map*
|
|
|
|
Object_merge_map::get_or_make_input_merge_map(const Merge_map* merge_map,
|
|
|
|
unsigned int shndx)
|
|
|
|
{
|
|
|
|
Input_merge_map* map = this->get_input_merge_map(shndx);
|
|
|
|
if (map != NULL)
|
|
|
|
{
|
|
|
|
// For a given input section in a given object, every mapping
|
2007-12-20 17:27:34 +01:00
|
|
|
// must be done with the same Merge_map.
|
2007-11-27 07:13:33 +01:00
|
|
|
gold_assert(map->merge_map == merge_map);
|
|
|
|
return map;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We need to create a new entry.
|
|
|
|
if (this->first_shnum_ == -1U)
|
2007-10-10 08:33:56 +02:00
|
|
|
{
|
2007-11-27 07:13:33 +01:00
|
|
|
this->first_shnum_ = shndx;
|
|
|
|
this->first_map_.merge_map = merge_map;
|
|
|
|
return &this->first_map_;
|
2007-10-10 08:33:56 +02:00
|
|
|
}
|
2007-11-27 07:13:33 +01:00
|
|
|
if (this->second_shnum_ == -1U)
|
|
|
|
{
|
|
|
|
this->second_shnum_ = shndx;
|
|
|
|
this->second_map_.merge_map = merge_map;
|
|
|
|
return &this->second_map_;
|
|
|
|
}
|
|
|
|
|
|
|
|
Input_merge_map* new_map = new Input_merge_map;
|
|
|
|
new_map->merge_map = merge_map;
|
|
|
|
this->section_merge_maps_[shndx] = new_map;
|
|
|
|
return new_map;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a mapping.
|
|
|
|
|
|
|
|
void
|
|
|
|
Object_merge_map::add_mapping(const Merge_map* merge_map, unsigned int shndx,
|
2007-12-18 01:48:04 +01:00
|
|
|
section_offset_type input_offset,
|
|
|
|
section_size_type length,
|
|
|
|
section_offset_type output_offset)
|
2007-11-27 07:13:33 +01:00
|
|
|
{
|
|
|
|
Input_merge_map* map = this->get_or_make_input_merge_map(merge_map, shndx);
|
|
|
|
|
|
|
|
// Try to merge the new entry in the last one we saw.
|
|
|
|
if (!map->entries.empty())
|
|
|
|
{
|
|
|
|
Input_merge_entry& entry(map->entries.back());
|
|
|
|
|
2007-12-18 01:48:04 +01:00
|
|
|
// Use section_size_type to avoid signed/unsigned warnings.
|
|
|
|
section_size_type input_offset_u = input_offset;
|
|
|
|
section_size_type output_offset_u = output_offset;
|
|
|
|
|
2007-11-27 07:13:33 +01:00
|
|
|
// If this entry is not in order, we need to sort the vector
|
|
|
|
// before looking anything up.
|
2007-12-18 01:48:04 +01:00
|
|
|
if (input_offset_u < entry.input_offset + entry.length)
|
2007-11-27 07:13:33 +01:00
|
|
|
{
|
2007-12-18 01:48:04 +01:00
|
|
|
gold_assert(input_offset < entry.input_offset);
|
|
|
|
gold_assert(input_offset_u + length
|
|
|
|
<= static_cast<section_size_type>(entry.input_offset));
|
2007-11-27 07:13:33 +01:00
|
|
|
map->sorted = false;
|
|
|
|
}
|
2007-12-18 01:48:04 +01:00
|
|
|
else if (entry.input_offset + entry.length == input_offset_u
|
2007-11-27 07:13:33 +01:00
|
|
|
&& (output_offset == -1
|
|
|
|
? entry.output_offset == -1
|
2007-12-18 01:48:04 +01:00
|
|
|
: entry.output_offset + entry.length == output_offset_u))
|
2007-11-27 07:13:33 +01:00
|
|
|
{
|
|
|
|
entry.length += length;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Input_merge_entry entry;
|
|
|
|
entry.input_offset = input_offset;
|
|
|
|
entry.length = length;
|
|
|
|
entry.output_offset = output_offset;
|
|
|
|
map->entries.push_back(entry);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the output offset for an input address.
|
|
|
|
|
2008-04-08 20:46:43 +02:00
|
|
|
bool
|
2007-11-27 07:13:33 +01:00
|
|
|
Object_merge_map::get_output_offset(const Merge_map* merge_map,
|
2007-12-18 01:48:04 +01:00
|
|
|
unsigned int shndx,
|
|
|
|
section_offset_type input_offset,
|
2010-08-25 10:36:54 +02:00
|
|
|
section_offset_type* output_offset)
|
2007-11-27 07:13:33 +01:00
|
|
|
{
|
|
|
|
Input_merge_map* map = this->get_input_merge_map(shndx);
|
2007-12-21 22:19:45 +01:00
|
|
|
if (map == NULL
|
|
|
|
|| (merge_map != NULL && map->merge_map != merge_map))
|
2007-11-27 07:13:33 +01:00
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!map->sorted)
|
|
|
|
{
|
|
|
|
std::sort(map->entries.begin(), map->entries.end(),
|
|
|
|
Input_merge_compare());
|
|
|
|
map->sorted = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
Input_merge_entry entry;
|
|
|
|
entry.input_offset = input_offset;
|
|
|
|
std::vector<Input_merge_entry>::const_iterator p =
|
|
|
|
std::lower_bound(map->entries.begin(), map->entries.end(),
|
|
|
|
entry, Input_merge_compare());
|
|
|
|
if (p == map->entries.end() || p->input_offset > input_offset)
|
|
|
|
{
|
|
|
|
if (p == map->entries.begin())
|
|
|
|
return false;
|
|
|
|
--p;
|
|
|
|
gold_assert(p->input_offset <= input_offset);
|
|
|
|
}
|
|
|
|
|
2007-12-18 01:48:04 +01:00
|
|
|
if (input_offset - p->input_offset
|
|
|
|
>= static_cast<section_offset_type>(p->length))
|
2007-11-27 07:13:33 +01:00
|
|
|
return false;
|
|
|
|
|
|
|
|
*output_offset = p->output_offset;
|
|
|
|
if (*output_offset != -1)
|
|
|
|
*output_offset += (input_offset - p->input_offset);
|
|
|
|
return true;
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
2007-12-21 22:19:45 +01:00
|
|
|
// Return whether this is the merge map for section SHNDX.
|
|
|
|
|
|
|
|
inline bool
|
|
|
|
Object_merge_map::is_merge_section_for(const Merge_map* merge_map,
|
|
|
|
unsigned int shndx)
|
|
|
|
{
|
|
|
|
Input_merge_map* map = this->get_input_merge_map(shndx);
|
|
|
|
return map != NULL && map->merge_map == merge_map;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize a mapping from input offsets to output addresses.
|
|
|
|
|
|
|
|
template<int size>
|
|
|
|
void
|
|
|
|
Object_merge_map::initialize_input_to_output_map(
|
|
|
|
unsigned int shndx,
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Addr starting_address,
|
|
|
|
Unordered_map<section_offset_type,
|
|
|
|
typename elfcpp::Elf_types<size>::Elf_Addr>* initialize_map)
|
|
|
|
{
|
|
|
|
Input_merge_map* map = this->get_input_merge_map(shndx);
|
|
|
|
gold_assert(map != NULL);
|
|
|
|
|
2009-07-10 01:29:55 +02:00
|
|
|
gold_assert(initialize_map->empty());
|
|
|
|
// We know how many entries we are going to add.
|
|
|
|
// reserve_unordered_map takes an expected count of buckets, not a
|
|
|
|
// count of elements, so double it to try to reduce collisions.
|
|
|
|
reserve_unordered_map(initialize_map, map->entries.size() * 2);
|
|
|
|
|
2007-12-21 22:19:45 +01:00
|
|
|
for (Input_merge_map::Entries::const_iterator p = map->entries.begin();
|
|
|
|
p != map->entries.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
section_offset_type output_offset = p->output_offset;
|
|
|
|
if (output_offset != -1)
|
|
|
|
output_offset += starting_address;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// If we see a relocation against an address we have chosen
|
|
|
|
// to discard, we relocate to zero. FIXME: We could also
|
|
|
|
// issue a warning in this case; that would require
|
|
|
|
// reporting this somehow and checking it in the routines in
|
|
|
|
// reloc.h.
|
|
|
|
output_offset = 0;
|
|
|
|
}
|
|
|
|
initialize_map->insert(std::make_pair(p->input_offset, output_offset));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-09 08:00:15 +01:00
|
|
|
// Class Merge_map.
|
|
|
|
|
|
|
|
// Add a mapping for the bytes from OFFSET to OFFSET + LENGTH in input
|
2007-12-20 17:27:34 +01:00
|
|
|
// section SHNDX in object OBJECT to an OUTPUT_OFFSET in merged data
|
|
|
|
// in an output section.
|
2007-05-16 19:42:48 +02:00
|
|
|
|
|
|
|
void
|
2007-11-09 08:00:15 +01:00
|
|
|
Merge_map::add_mapping(Relobj* object, unsigned int shndx,
|
2007-12-18 01:48:04 +01:00
|
|
|
section_offset_type offset, section_size_type length,
|
|
|
|
section_offset_type output_offset)
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 00:05:01 +02:00
|
|
|
gold_assert(object != NULL);
|
2007-11-27 07:13:33 +01:00
|
|
|
Object_merge_map* object_merge_map = object->merge_map();
|
|
|
|
if (object_merge_map == NULL)
|
|
|
|
{
|
|
|
|
object_merge_map = new Object_merge_map();
|
|
|
|
object->set_merge_map(object_merge_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
object_merge_map->add_mapping(this, shndx, offset, length, output_offset);
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
2007-11-09 08:00:15 +01:00
|
|
|
// Return the output offset for an input address. The input address
|
|
|
|
// is at offset OFFSET in section SHNDX in OBJECT. This sets
|
2007-12-20 17:27:34 +01:00
|
|
|
// *OUTPUT_OFFSET to the offset in the merged data in the output
|
|
|
|
// section. This returns true if the mapping is known, false
|
|
|
|
// otherwise.
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2007-12-20 02:32:10 +01:00
|
|
|
bool
|
2007-11-09 08:00:15 +01:00
|
|
|
Merge_map::get_output_offset(const Relobj* object, unsigned int shndx,
|
2007-12-18 01:48:04 +01:00
|
|
|
section_offset_type offset,
|
|
|
|
section_offset_type* output_offset) const
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
2007-11-27 07:13:33 +01:00
|
|
|
Object_merge_map* object_merge_map = object->merge_map();
|
|
|
|
if (object_merge_map == NULL)
|
2007-05-16 19:42:48 +02:00
|
|
|
return false;
|
2007-11-27 07:13:33 +01:00
|
|
|
return object_merge_map->get_output_offset(this, shndx, offset,
|
|
|
|
output_offset);
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
2007-12-21 22:19:45 +01:00
|
|
|
// Return whether this is the merge section for SHNDX in OBJECT.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Merge_map::is_merge_section_for(const Relobj* object, unsigned int shndx) const
|
|
|
|
{
|
|
|
|
Object_merge_map* object_merge_map = object->merge_map();
|
|
|
|
if (object_merge_map == NULL)
|
|
|
|
return false;
|
|
|
|
return object_merge_map->is_merge_section_for(this, shndx);
|
|
|
|
}
|
|
|
|
|
2007-11-09 08:00:15 +01:00
|
|
|
// Class Output_merge_base.
|
|
|
|
|
|
|
|
// Return the output offset for an input offset. The input address is
|
|
|
|
// at offset OFFSET in section SHNDX in OBJECT. If we know the
|
|
|
|
// offset, set *POUTPUT and return true. Otherwise return false.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_merge_base::do_output_offset(const Relobj* object,
|
|
|
|
unsigned int shndx,
|
2009-12-14 20:53:05 +01:00
|
|
|
section_offset_type offset,
|
2007-12-18 01:48:04 +01:00
|
|
|
section_offset_type* poutput) const
|
2007-11-09 08:00:15 +01:00
|
|
|
{
|
2009-12-14 20:53:05 +01:00
|
|
|
return this->merge_map_.get_output_offset(object, shndx, offset, poutput);
|
2007-11-09 08:00:15 +01:00
|
|
|
}
|
|
|
|
|
2007-12-21 22:19:45 +01:00
|
|
|
// Return whether this is the merge section for SHNDX in OBJECT.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_merge_base::do_is_merge_section_for(const Relobj* object,
|
|
|
|
unsigned int shndx) const
|
|
|
|
{
|
|
|
|
return this->merge_map_.is_merge_section_for(object, shndx);
|
|
|
|
}
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 09:43:39 +02:00
|
|
|
// Record a merged input section for script processing.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_merge_base::record_input_section(Relobj* relobj, unsigned int shndx)
|
|
|
|
{
|
|
|
|
gold_assert(this->keeps_input_sections_ && relobj != NULL);
|
|
|
|
// If this is the first input section, record it. We need do this because
|
|
|
|
// this->input_sections_ is unordered.
|
|
|
|
if (this->first_relobj_ == NULL)
|
|
|
|
{
|
|
|
|
this->first_relobj_ = relobj;
|
|
|
|
this->first_shndx_ = shndx;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::pair<Input_sections::iterator, bool> result =
|
|
|
|
this->input_sections_.insert(Section_id(relobj, shndx));
|
|
|
|
// We should insert a merge section once only.
|
|
|
|
gold_assert(result.second);
|
|
|
|
}
|
|
|
|
|
2007-11-09 08:00:15 +01:00
|
|
|
// Class Output_merge_data.
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
// Compute the hash code for a fixed-size constant.
|
|
|
|
|
|
|
|
size_t
|
|
|
|
Output_merge_data::Merge_data_hash::operator()(Merge_data_key k) const
|
|
|
|
{
|
|
|
|
const unsigned char* p = this->pomd_->constant(k);
|
2007-12-18 01:48:04 +01:00
|
|
|
section_size_type entsize =
|
|
|
|
convert_to_section_size_type(this->pomd_->entsize());
|
2007-05-16 19:42:48 +02:00
|
|
|
|
|
|
|
// Fowler/Noll/Vo (FNV) hash (type FNV-1a).
|
|
|
|
if (sizeof(size_t) == 8)
|
|
|
|
{
|
|
|
|
size_t result = static_cast<size_t>(14695981039346656037ULL);
|
2007-12-18 01:48:04 +01:00
|
|
|
for (section_size_type i = 0; i < entsize; ++i)
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
|
|
|
result &= (size_t) *p++;
|
|
|
|
result *= 1099511628211ULL;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
size_t result = 2166136261UL;
|
2007-12-18 01:48:04 +01:00
|
|
|
for (section_size_type i = 0; i < entsize; ++i)
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
|
|
|
result ^= (size_t) *p++;
|
|
|
|
result *= 16777619UL;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return whether one hash table key equals another.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_merge_data::Merge_data_eq::operator()(Merge_data_key k1,
|
|
|
|
Merge_data_key k2) const
|
|
|
|
{
|
|
|
|
const unsigned char* p1 = this->pomd_->constant(k1);
|
|
|
|
const unsigned char* p2 = this->pomd_->constant(k2);
|
|
|
|
return memcmp(p1, p2, this->pomd_->entsize()) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a constant to the end of the section contents.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_merge_data::add_constant(const unsigned char* p)
|
|
|
|
{
|
2009-12-14 20:53:05 +01:00
|
|
|
section_size_type entsize = convert_to_section_size_type(this->entsize());
|
|
|
|
section_size_type addralign =
|
2007-12-18 01:48:04 +01:00
|
|
|
convert_to_section_size_type(this->addralign());
|
2009-12-14 20:53:05 +01:00
|
|
|
section_size_type addsize = std::max(entsize, addralign);
|
2007-10-18 19:46:23 +02:00
|
|
|
if (this->len_ + addsize > this->alc_)
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
|
|
|
if (this->alc_ == 0)
|
2007-10-18 19:46:23 +02:00
|
|
|
this->alc_ = 128 * addsize;
|
2007-05-16 19:42:48 +02:00
|
|
|
else
|
|
|
|
this->alc_ *= 2;
|
|
|
|
this->p_ = static_cast<unsigned char*>(realloc(this->p_, this->alc_));
|
|
|
|
if (this->p_ == NULL)
|
2007-10-14 08:49:14 +02:00
|
|
|
gold_nomem();
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
2009-12-14 20:53:05 +01:00
|
|
|
memcpy(this->p_ + this->len_, p, entsize);
|
|
|
|
if (addsize > entsize)
|
|
|
|
memset(this->p_ + this->len_ + entsize, 0, addsize - entsize);
|
2007-10-18 19:46:23 +02:00
|
|
|
this->len_ += addsize;
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add the input section SHNDX in OBJECT to a merged output section
|
|
|
|
// which holds fixed length constants. Return whether we were able to
|
|
|
|
// handle the section; if not, it will be linked as usual without
|
|
|
|
// constant merging.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_merge_data::do_add_input_section(Relobj* object, unsigned int shndx)
|
|
|
|
{
|
2007-12-18 01:48:04 +01:00
|
|
|
section_size_type len;
|
2010-07-12 19:59:58 +02:00
|
|
|
section_size_type uncompressed_size = 0;
|
|
|
|
unsigned char* uncompressed_data = NULL;
|
2007-09-25 19:50:26 +02:00
|
|
|
const unsigned char* p = object->section_contents(shndx, &len, false);
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2010-07-12 19:59:58 +02:00
|
|
|
if (object->section_is_compressed(shndx, &uncompressed_size))
|
|
|
|
{
|
|
|
|
uncompressed_data = new unsigned char[uncompressed_size];
|
|
|
|
if (!decompress_input_section(p, len, uncompressed_data,
|
|
|
|
uncompressed_size))
|
|
|
|
object->error(_("could not decompress section %s"),
|
|
|
|
object->section_name(shndx).c_str());
|
|
|
|
p = uncompressed_data;
|
|
|
|
len = uncompressed_size;
|
|
|
|
}
|
|
|
|
|
2009-12-14 20:53:05 +01:00
|
|
|
section_size_type entsize = convert_to_section_size_type(this->entsize());
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2009-12-14 20:53:05 +01:00
|
|
|
if (len % entsize != 0)
|
2010-07-12 19:59:58 +02:00
|
|
|
{
|
|
|
|
if (uncompressed_data != NULL)
|
|
|
|
delete[] uncompressed_data;
|
|
|
|
return false;
|
|
|
|
}
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2009-12-14 20:53:05 +01:00
|
|
|
this->input_count_ += len / entsize;
|
2007-12-18 22:24:10 +01:00
|
|
|
|
2009-12-14 20:53:05 +01:00
|
|
|
for (section_size_type i = 0; i < len; i += entsize, p += entsize)
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
|
|
|
// Add the constant to the section contents. If we find that it
|
|
|
|
// is already in the hash table, we will remove it again.
|
|
|
|
Merge_data_key k = this->len_;
|
|
|
|
this->add_constant(p);
|
|
|
|
|
|
|
|
std::pair<Merge_data_hashtable::iterator, bool> ins =
|
|
|
|
this->hashtable_.insert(k);
|
|
|
|
|
|
|
|
if (!ins.second)
|
|
|
|
{
|
|
|
|
// Key was already present. Remove the copy we just added.
|
2009-12-14 20:53:05 +01:00
|
|
|
this->len_ -= entsize;
|
2007-05-16 19:42:48 +02:00
|
|
|
k = *ins.first;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Record the offset of this constant in the output section.
|
2009-12-14 20:53:05 +01:00
|
|
|
this->add_mapping(object, shndx, i, entsize, k);
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 09:43:39 +02:00
|
|
|
// For script processing, we keep the input sections.
|
|
|
|
if (this->keeps_input_sections())
|
|
|
|
record_input_section(object, shndx);
|
|
|
|
|
2010-07-12 19:59:58 +02:00
|
|
|
if (uncompressed_data != NULL)
|
|
|
|
delete[] uncompressed_data;
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the final data size in a merged output section with fixed size
|
|
|
|
// constants.
|
|
|
|
|
|
|
|
void
|
2007-11-29 21:10:17 +01:00
|
|
|
Output_merge_data::set_final_data_size()
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
|
|
|
// Release the memory we don't need.
|
|
|
|
this->p_ = static_cast<unsigned char*>(realloc(this->p_, this->len_));
|
2010-04-09 02:04:30 +02:00
|
|
|
// An Output_merge_data object may be empty and realloc is allowed
|
|
|
|
// to return a NULL pointer in this case. An Output_merge_data is empty
|
|
|
|
// if all its input sections have sizes that are not multiples of entsize.
|
|
|
|
gold_assert(this->p_ != NULL || this->len_ == 0);
|
2007-05-16 19:42:48 +02:00
|
|
|
this->set_data_size(this->len_);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write the data of a merged output section with fixed size constants
|
|
|
|
// to the file.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_merge_data::do_write(Output_file* of)
|
|
|
|
{
|
|
|
|
of->write(this->offset(), this->p_, this->len_);
|
|
|
|
}
|
|
|
|
|
2007-12-01 07:34:12 +01:00
|
|
|
// Write the data to a buffer.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_merge_data::do_write_to_buffer(unsigned char* buffer)
|
|
|
|
{
|
|
|
|
memcpy(buffer, this->p_, this->len_);
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:24:10 +01:00
|
|
|
// Print merge stats to stderr.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_merge_data::do_print_merge_stats(const char* section_name)
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
_("%s: %s merged constants size: %lu; input: %zu; output: %zu\n"),
|
|
|
|
program_name, section_name,
|
|
|
|
static_cast<unsigned long>(this->entsize()),
|
|
|
|
this->input_count_, this->hashtable_.size());
|
|
|
|
}
|
|
|
|
|
2007-11-09 08:00:15 +01:00
|
|
|
// Class Output_merge_string.
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
// Add an input section to a merged string section.
|
|
|
|
|
|
|
|
template<typename Char_type>
|
|
|
|
bool
|
|
|
|
Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
|
|
|
|
unsigned int shndx)
|
|
|
|
{
|
2007-12-18 01:48:04 +01:00
|
|
|
section_size_type len;
|
2010-07-12 19:59:58 +02:00
|
|
|
section_size_type uncompressed_size = 0;
|
|
|
|
unsigned char* uncompressed_data = NULL;
|
2007-09-25 19:50:26 +02:00
|
|
|
const unsigned char* pdata = object->section_contents(shndx, &len, false);
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2010-07-12 19:59:58 +02:00
|
|
|
if (object->section_is_compressed(shndx, &uncompressed_size))
|
|
|
|
{
|
|
|
|
uncompressed_data = new unsigned char[uncompressed_size];
|
|
|
|
if (!decompress_input_section(pdata, len, uncompressed_data,
|
|
|
|
uncompressed_size))
|
|
|
|
object->error(_("could not decompress section %s"),
|
|
|
|
object->section_name(shndx).c_str());
|
|
|
|
pdata = uncompressed_data;
|
|
|
|
len = uncompressed_size;
|
|
|
|
}
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
|
2009-03-23 22:15:08 +01:00
|
|
|
const Char_type* pend = p + len / sizeof(Char_type);
|
2010-08-03 22:38:09 +02:00
|
|
|
const Char_type* pend0 = pend;
|
2007-05-16 19:42:48 +02:00
|
|
|
|
|
|
|
if (len % sizeof(Char_type) != 0)
|
|
|
|
{
|
2007-10-14 08:49:14 +02:00
|
|
|
object->error(_("mergeable string section length not multiple of "
|
|
|
|
"character size"));
|
2010-07-12 19:59:58 +02:00
|
|
|
if (uncompressed_data != NULL)
|
|
|
|
delete[] uncompressed_data;
|
2007-10-14 08:49:14 +02:00
|
|
|
return false;
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
2010-08-03 22:38:09 +02:00
|
|
|
if (pend[-1] != 0)
|
|
|
|
{
|
|
|
|
gold_warning(_("%s: last entry in mergeable string section '%s' "
|
|
|
|
"not null terminated"),
|
|
|
|
object->name().c_str(),
|
|
|
|
object->section_name(shndx).c_str());
|
|
|
|
// Find the end of the last NULL-terminated string in the buffer.
|
|
|
|
while (pend0 > p && pend0[-1] != 0)
|
|
|
|
--pend0;
|
|
|
|
}
|
2007-12-18 22:24:10 +01:00
|
|
|
|
2010-07-21 23:03:54 +02:00
|
|
|
Merged_strings_list* merged_strings_list =
|
|
|
|
new Merged_strings_list(object, shndx);
|
|
|
|
this->merged_strings_lists_.push_back(merged_strings_list);
|
|
|
|
Merged_strings& merged_strings = merged_strings_list->merged_strings;
|
|
|
|
|
2010-08-03 22:38:09 +02:00
|
|
|
// Count the number of strings in the section and size the list.
|
|
|
|
size_t count = 0;
|
|
|
|
for (const Char_type* pt = p; pt < pend0; pt += string_length(pt) + 1)
|
|
|
|
++count;
|
|
|
|
if (pend0 < pend)
|
|
|
|
++count;
|
|
|
|
merged_strings.reserve(count + 1);
|
|
|
|
|
2007-10-20 01:33:37 +02:00
|
|
|
// The index I is in bytes, not characters.
|
2007-12-18 01:48:04 +01:00
|
|
|
section_size_type i = 0;
|
2010-08-03 22:38:09 +02:00
|
|
|
while (p < pend0)
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
2010-08-03 22:38:09 +02:00
|
|
|
size_t len = string_length(p);
|
|
|
|
|
|
|
|
Stringpool::Key key;
|
|
|
|
this->stringpool_.add_with_length(p, len, true, &key);
|
|
|
|
|
|
|
|
merged_strings.push_back(Merged_string(i, key));
|
|
|
|
|
|
|
|
p += len + 1;
|
|
|
|
i += (len + 1) * sizeof(Char_type);
|
|
|
|
}
|
|
|
|
if (p < pend)
|
|
|
|
{
|
|
|
|
size_t len = pend - p;
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2007-12-19 02:23:46 +01:00
|
|
|
Stringpool::Key key;
|
2010-08-03 22:38:09 +02:00
|
|
|
this->stringpool_.add_with_length(p, len, true, &key);
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2010-07-21 23:03:54 +02:00
|
|
|
merged_strings.push_back(Merged_string(i, key));
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2010-08-03 22:38:09 +02:00
|
|
|
i += (len + 1) * sizeof(Char_type);
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
2010-07-21 23:03:54 +02:00
|
|
|
// Record the last offset in the input section so that we can
|
|
|
|
// compute the length of the last string.
|
|
|
|
merged_strings.push_back(Merged_string(i, 0));
|
|
|
|
|
2007-12-18 22:24:10 +01:00
|
|
|
this->input_count_ += count;
|
2010-08-03 22:38:09 +02:00
|
|
|
this->input_size_ += len;
|
2007-12-18 22:24:10 +01:00
|
|
|
|
2010-05-23 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_input_section::do_output_offset): Use convert_types
instead of a cast.
(Target_arm::apply_cortex_a8_workaround): Rewrite a conditional branch
with a direct branch, not a conditional branch, to a stub.
* merge.cc (Output_merge_base::record_input_section): New method
defintion.
(Output_merge_data::do_add_input_section): Record input section if
keeps-input-sections flag is set.
(Output_merge_string::do_add_input_section): Ditto.
* merge.h (Output_merge_base::Output_merge_base): Initialize new data
members KEEPS_INPUT_SECTIONS_, FIRST_RELOBJ_, FIRST_SHNDX_ and
INPUT_SECTIONS_.
(Output_merge_base::keeps_input_sections,
Output_merge_base::set_keeps_input_sections,
Output_merge_base::first_relobj, Output_merge_base::first_shndx): New
method definitions.
(Output_merge_base::Input_sections): New type declaration.
(Output_merge_base::input_sections_begin,
Output_merge_base::input_sections_end,
Output_merge_base::do_set_keeps_input_sections): New method definitions.
(Output_merge_base::bool keeps_input_sections_,
Output_merge_base::first_relobj_, Output_merge_base::first_shndx_,
Output_merge_base::input_sections_): New data members.
(Output_merge_data::do_set_keeps_input_sections): New method
defintion.
(Output_merge_string::do_set_keeps_input_sections): Ditto.
* output.cc (Output_section::Input_section::relobj): Move method
defintion from class declaration to here and handle merge sections.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Output_section): Remove initializations of removed
data members and initialize new data member LOOKUP_MAPS_.
(Output_section::add_input_section): Set keeps-input-sections flag
for a newly created merge output section as appropriate. Adjust code
to use Output_section_lookup_maps class.
(Output_section::add_relaxed_input_section): Adjst code for lookup
maps code refactoring.
(Output_section::add_merge_input_section): Add a new parameter
KEEPS_INPUT_SECTION. Adjust code to use Output_section_lookup_maps
class. If adding input section to a newly created merge output
section fails, remove the new merge section.
(Output_section::convert_input_sections_in_list_to_relaxed_input_sections):
Adjust code for use of the Output_section_lookup_maps class.
(Output_section::find_merge_section): Ditto.
(Output_section::build_lookup_maps): New method defintion.
(Output_section::find_relaxed_input_section): Adjust code to use
Output_section_lookup_maps class.
(Output_section::get_input_sections): Export merge sections. Adjust
code to use Output_section_lookup_maps class.
(Output_section:::add_script_input_section): Adjust code to use
Output_section_lookup_maps class. Update lookup maps for merge
sections also.
(Output_section::discard_states): Use Output_section_lookup_maps.
(Output_section::restore_states): Same.
* output.h (Merge_section_properties): Move class defintion out of
Output_section.
(Output_section_lookup_maps): New class.
(Output_section::Input_section::is_merge_section): New method
defintion.
(Output_section::Input_section::relobj): Move defintion out of class
defintion. Declare method only.
(Output_section::Input_section::shndx): Ditto.
(Output_section::Input_section::output_merge_base): New method defintion.
(Output_section::Input_section::u2_.pomb): New union field.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Ouptut_relaxed_input_section_by_input_section_map):
Remove types.
(Output_section::add_merge_input_section): Add new parameter
KEEPS_INPUT_SECTIONS.
(Output_section::build_lookup_maps): New method declaration.
(Output_section::merge_section_map_,
Output_section::merge_section_by_properties_map_,
Output_section::relaxed_input_section_map_,
Output_section::is_relaxed_input_section_map_valid_): Remove data
members.
(Output_section::lookup_maps_): New data member.
2010-05-23 09:43:39 +02:00
|
|
|
// For script processing, we keep the input sections.
|
|
|
|
if (this->keeps_input_sections())
|
|
|
|
record_input_section(object, shndx);
|
|
|
|
|
2010-07-12 19:59:58 +02:00
|
|
|
if (uncompressed_data != NULL)
|
|
|
|
delete[] uncompressed_data;
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2007-11-30 01:35:27 +01:00
|
|
|
// Finalize the mappings from the input sections to the output
|
|
|
|
// section, and return the final data size.
|
2007-05-16 19:42:48 +02:00
|
|
|
|
|
|
|
template<typename Char_type>
|
2007-12-18 01:48:04 +01:00
|
|
|
section_size_type
|
2007-11-30 01:35:27 +01:00
|
|
|
Output_merge_string<Char_type>::finalize_merged_data()
|
2007-05-16 19:42:48 +02:00
|
|
|
{
|
|
|
|
this->stringpool_.set_string_offsets();
|
|
|
|
|
2010-07-21 23:03:54 +02:00
|
|
|
for (typename Merged_strings_lists::const_iterator l =
|
|
|
|
this->merged_strings_lists_.begin();
|
|
|
|
l != this->merged_strings_lists_.end();
|
|
|
|
++l)
|
2007-12-19 01:29:28 +01:00
|
|
|
{
|
2010-07-21 23:03:54 +02:00
|
|
|
section_offset_type last_input_offset = 0;
|
|
|
|
section_offset_type last_output_offset = 0;
|
|
|
|
for (typename Merged_strings::const_iterator p =
|
|
|
|
(*l)->merged_strings.begin();
|
|
|
|
p != (*l)->merged_strings.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
section_size_type length = p->offset - last_input_offset;
|
|
|
|
if (length > 0)
|
|
|
|
this->add_mapping((*l)->object, (*l)->shndx, last_input_offset,
|
|
|
|
length, last_output_offset);
|
|
|
|
last_input_offset = p->offset;
|
|
|
|
if (p->stringpool_key != 0)
|
|
|
|
last_output_offset =
|
|
|
|
this->stringpool_.get_offset_from_key(p->stringpool_key);
|
|
|
|
}
|
|
|
|
delete *l;
|
2007-12-19 01:29:28 +01:00
|
|
|
}
|
2007-05-16 19:42:48 +02:00
|
|
|
|
2008-03-13 21:58:11 +01:00
|
|
|
// Save some memory. This also ensures that this function will work
|
|
|
|
// if called twice, as may happen if Layout::set_segment_offsets
|
|
|
|
// finds a better alignment.
|
2010-07-21 23:03:54 +02:00
|
|
|
this->merged_strings_lists_.clear();
|
2007-11-30 01:35:27 +01:00
|
|
|
|
|
|
|
return this->stringpool_.get_strtab_size();
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename Char_type>
|
|
|
|
void
|
|
|
|
Output_merge_string<Char_type>::set_final_data_size()
|
|
|
|
{
|
|
|
|
const off_t final_data_size = this->finalize_merged_data();
|
|
|
|
this->set_data_size(final_data_size);
|
2007-05-16 19:42:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Write out a merged string section.
|
|
|
|
|
|
|
|
template<typename Char_type>
|
|
|
|
void
|
|
|
|
Output_merge_string<Char_type>::do_write(Output_file* of)
|
|
|
|
{
|
|
|
|
this->stringpool_.write(of, this->offset());
|
|
|
|
}
|
|
|
|
|
2007-12-01 07:34:12 +01:00
|
|
|
// Write a merged string section to a buffer.
|
|
|
|
|
|
|
|
template<typename Char_type>
|
|
|
|
void
|
|
|
|
Output_merge_string<Char_type>::do_write_to_buffer(unsigned char* buffer)
|
|
|
|
{
|
|
|
|
this->stringpool_.write_to_buffer(buffer, this->data_size());
|
|
|
|
}
|
|
|
|
|
2007-12-18 22:24:10 +01:00
|
|
|
// Return the name of the types of string to use with
|
|
|
|
// do_print_merge_stats.
|
|
|
|
|
|
|
|
template<typename Char_type>
|
|
|
|
const char*
|
|
|
|
Output_merge_string<Char_type>::string_name()
|
|
|
|
{
|
|
|
|
gold_unreachable();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
template<>
|
|
|
|
const char*
|
|
|
|
Output_merge_string<char>::string_name()
|
|
|
|
{
|
|
|
|
return "strings";
|
|
|
|
}
|
|
|
|
|
|
|
|
template<>
|
|
|
|
const char*
|
|
|
|
Output_merge_string<uint16_t>::string_name()
|
|
|
|
{
|
|
|
|
return "16-bit strings";
|
|
|
|
}
|
|
|
|
|
|
|
|
template<>
|
|
|
|
const char*
|
|
|
|
Output_merge_string<uint32_t>::string_name()
|
|
|
|
{
|
|
|
|
return "32-bit strings";
|
|
|
|
}
|
|
|
|
|
|
|
|
// Print merge stats to stderr.
|
|
|
|
|
|
|
|
template<typename Char_type>
|
|
|
|
void
|
|
|
|
Output_merge_string<Char_type>::do_print_merge_stats(const char* section_name)
|
|
|
|
{
|
|
|
|
char buf[200];
|
|
|
|
snprintf(buf, sizeof buf, "%s merged %s", section_name, this->string_name());
|
2010-08-03 22:38:09 +02:00
|
|
|
fprintf(stderr, _("%s: %s input bytes: %zu\n"),
|
|
|
|
program_name, buf, this->input_size_);
|
|
|
|
fprintf(stderr, _("%s: %s input strings: %zu\n"),
|
2007-12-18 22:24:10 +01:00
|
|
|
program_name, buf, this->input_count_);
|
|
|
|
this->stringpool_.print_stats(buf);
|
|
|
|
}
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
// Instantiate the templates we need.
|
|
|
|
|
|
|
|
template
|
|
|
|
class Output_merge_string<char>;
|
|
|
|
|
|
|
|
template
|
|
|
|
class Output_merge_string<uint16_t>;
|
|
|
|
|
|
|
|
template
|
|
|
|
class Output_merge_string<uint32_t>;
|
|
|
|
|
2007-12-21 22:19:45 +01:00
|
|
|
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
|
|
|
|
template
|
|
|
|
void
|
|
|
|
Object_merge_map::initialize_input_to_output_map<32>(
|
|
|
|
unsigned int shndx,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr starting_address,
|
|
|
|
Unordered_map<section_offset_type, elfcpp::Elf_types<32>::Elf_Addr>*);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
|
|
|
|
template
|
|
|
|
void
|
|
|
|
Object_merge_map::initialize_input_to_output_map<64>(
|
|
|
|
unsigned int shndx,
|
|
|
|
elfcpp::Elf_types<64>::Elf_Addr starting_address,
|
|
|
|
Unordered_map<section_offset_type, elfcpp::Elf_types<64>::Elf_Addr>*);
|
|
|
|
#endif
|
|
|
|
|
2007-05-16 19:42:48 +02:00
|
|
|
} // End namespace gold.
|