2008-01-23 02:31:13 +01:00
|
|
|
// script-sections.cc -- linker script SECTIONS for gold
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Copyright 2008, 2009 Free Software Foundation, Inc.
|
2008-01-23 02:31:13 +01: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.
|
|
|
|
|
|
|
|
#include "gold.h"
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
#include <cstring>
|
|
|
|
#include <algorithm>
|
|
|
|
#include <list>
|
2008-02-04 23:54:31 +01:00
|
|
|
#include <map>
|
2008-01-23 02:31:13 +01:00
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
2008-02-04 06:43:05 +01:00
|
|
|
#include <fnmatch.h>
|
2008-01-23 02:31:13 +01:00
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
#include "parameters.h"
|
|
|
|
#include "object.h"
|
|
|
|
#include "layout.h"
|
|
|
|
#include "output.h"
|
2008-01-23 02:31:13 +01:00
|
|
|
#include "script-c.h"
|
|
|
|
#include "script.h"
|
|
|
|
#include "script-sections.h"
|
|
|
|
|
|
|
|
// Support for the SECTIONS clause in linker scripts.
|
|
|
|
|
|
|
|
namespace gold
|
|
|
|
{
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Manage orphan sections. This is intended to be largely compatible
|
|
|
|
// with the GNU linker. The Linux kernel implicitly relies on
|
|
|
|
// something similar to the GNU linker's orphan placement. We
|
|
|
|
// originally used a simpler scheme here, but it caused the kernel
|
|
|
|
// build to fail, and was also rather inefficient.
|
|
|
|
|
|
|
|
class Orphan_section_placement
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
typedef Script_sections::Elements_iterator Elements_iterator;
|
|
|
|
|
|
|
|
public:
|
|
|
|
Orphan_section_placement();
|
|
|
|
|
|
|
|
// Handle an output section during initialization of this mapping.
|
|
|
|
void
|
|
|
|
output_section_init(const std::string& name, Output_section*,
|
|
|
|
Elements_iterator location);
|
|
|
|
|
|
|
|
// Initialize the last location.
|
|
|
|
void
|
|
|
|
last_init(Elements_iterator location);
|
|
|
|
|
|
|
|
// Set *PWHERE to the address of an iterator pointing to the
|
|
|
|
// location to use for an orphan section. Return true if the
|
|
|
|
// iterator has a value, false otherwise.
|
|
|
|
bool
|
|
|
|
find_place(Output_section*, Elements_iterator** pwhere);
|
|
|
|
|
|
|
|
// Return the iterator being used for sections at the very end of
|
|
|
|
// the linker script.
|
|
|
|
Elements_iterator
|
|
|
|
last_place() const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
// The places that we specifically recognize. This list is copied
|
|
|
|
// from the GNU linker.
|
|
|
|
enum Place_index
|
|
|
|
{
|
|
|
|
PLACE_TEXT,
|
|
|
|
PLACE_RODATA,
|
|
|
|
PLACE_DATA,
|
|
|
|
PLACE_BSS,
|
|
|
|
PLACE_REL,
|
|
|
|
PLACE_INTERP,
|
|
|
|
PLACE_NONALLOC,
|
|
|
|
PLACE_LAST,
|
|
|
|
PLACE_MAX
|
|
|
|
};
|
|
|
|
|
|
|
|
// The information we keep for a specific place.
|
|
|
|
struct Place
|
|
|
|
{
|
|
|
|
// The name of sections for this place.
|
|
|
|
const char* name;
|
|
|
|
// Whether we have a location for this place.
|
|
|
|
bool have_location;
|
|
|
|
// The iterator for this place.
|
|
|
|
Elements_iterator location;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Initialize one place element.
|
|
|
|
void
|
|
|
|
initialize_place(Place_index, const char*);
|
|
|
|
|
|
|
|
// The places.
|
|
|
|
Place places_[PLACE_MAX];
|
|
|
|
// True if this is the first call to output_section_init.
|
|
|
|
bool first_init_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Initialize Orphan_section_placement.
|
|
|
|
|
|
|
|
Orphan_section_placement::Orphan_section_placement()
|
|
|
|
: first_init_(true)
|
|
|
|
{
|
|
|
|
this->initialize_place(PLACE_TEXT, ".text");
|
|
|
|
this->initialize_place(PLACE_RODATA, ".rodata");
|
|
|
|
this->initialize_place(PLACE_DATA, ".data");
|
|
|
|
this->initialize_place(PLACE_BSS, ".bss");
|
|
|
|
this->initialize_place(PLACE_REL, NULL);
|
|
|
|
this->initialize_place(PLACE_INTERP, ".interp");
|
|
|
|
this->initialize_place(PLACE_NONALLOC, NULL);
|
|
|
|
this->initialize_place(PLACE_LAST, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize one place element.
|
|
|
|
|
|
|
|
void
|
|
|
|
Orphan_section_placement::initialize_place(Place_index index, const char* name)
|
|
|
|
{
|
|
|
|
this->places_[index].name = name;
|
|
|
|
this->places_[index].have_location = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// While initializing the Orphan_section_placement information, this
|
|
|
|
// is called once for each output section named in the linker script.
|
|
|
|
// If we found an output section during the link, it will be passed in
|
|
|
|
// OS.
|
|
|
|
|
|
|
|
void
|
|
|
|
Orphan_section_placement::output_section_init(const std::string& name,
|
|
|
|
Output_section* os,
|
|
|
|
Elements_iterator location)
|
|
|
|
{
|
|
|
|
bool first_init = this->first_init_;
|
|
|
|
this->first_init_ = false;
|
|
|
|
|
|
|
|
for (int i = 0; i < PLACE_MAX; ++i)
|
|
|
|
{
|
|
|
|
if (this->places_[i].name != NULL && this->places_[i].name == name)
|
|
|
|
{
|
|
|
|
if (this->places_[i].have_location)
|
|
|
|
{
|
|
|
|
// We have already seen a section with this name.
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
this->places_[i].location = location;
|
|
|
|
this->places_[i].have_location = true;
|
|
|
|
|
|
|
|
// If we just found the .bss section, restart the search for
|
|
|
|
// an unallocated section. This follows the GNU linker's
|
|
|
|
// behaviour.
|
|
|
|
if (i == PLACE_BSS)
|
|
|
|
this->places_[PLACE_NONALLOC].have_location = false;
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Relocation sections.
|
|
|
|
if (!this->places_[PLACE_REL].have_location
|
|
|
|
&& os != NULL
|
|
|
|
&& (os->type() == elfcpp::SHT_REL || os->type() == elfcpp::SHT_RELA)
|
|
|
|
&& (os->flags() & elfcpp::SHF_ALLOC) != 0)
|
|
|
|
{
|
|
|
|
this->places_[PLACE_REL].location = location;
|
|
|
|
this->places_[PLACE_REL].have_location = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We find the location for unallocated sections by finding the
|
|
|
|
// first debugging or comment section after the BSS section (if
|
|
|
|
// there is one).
|
|
|
|
if (!this->places_[PLACE_NONALLOC].have_location
|
|
|
|
&& (name == ".comment" || Layout::is_debug_info_section(name.c_str())))
|
|
|
|
{
|
|
|
|
// We add orphan sections after the location in PLACES_. We
|
|
|
|
// want to store unallocated sections before LOCATION. If this
|
|
|
|
// is the very first section, we can't use it.
|
|
|
|
if (!first_init)
|
|
|
|
{
|
|
|
|
--location;
|
|
|
|
this->places_[PLACE_NONALLOC].location = location;
|
|
|
|
this->places_[PLACE_NONALLOC].have_location = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize the last location.
|
|
|
|
|
|
|
|
void
|
|
|
|
Orphan_section_placement::last_init(Elements_iterator location)
|
|
|
|
{
|
|
|
|
this->places_[PLACE_LAST].location = location;
|
|
|
|
this->places_[PLACE_LAST].have_location = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set *PWHERE to the address of an iterator pointing to the location
|
|
|
|
// to use for an orphan section. Return true if the iterator has a
|
|
|
|
// value, false otherwise.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Orphan_section_placement::find_place(Output_section* os,
|
|
|
|
Elements_iterator** pwhere)
|
|
|
|
{
|
|
|
|
// Figure out where OS should go. This is based on the GNU linker
|
|
|
|
// code. FIXME: The GNU linker handles small data sections
|
|
|
|
// specially, but we don't.
|
|
|
|
elfcpp::Elf_Word type = os->type();
|
|
|
|
elfcpp::Elf_Xword flags = os->flags();
|
|
|
|
Place_index index;
|
|
|
|
if ((flags & elfcpp::SHF_ALLOC) == 0
|
|
|
|
&& !Layout::is_debug_info_section(os->name()))
|
|
|
|
index = PLACE_NONALLOC;
|
|
|
|
else if ((flags & elfcpp::SHF_ALLOC) == 0)
|
|
|
|
index = PLACE_LAST;
|
|
|
|
else if (type == elfcpp::SHT_NOTE)
|
|
|
|
index = PLACE_INTERP;
|
|
|
|
else if (type == elfcpp::SHT_NOBITS)
|
|
|
|
index = PLACE_BSS;
|
|
|
|
else if ((flags & elfcpp::SHF_WRITE) != 0)
|
|
|
|
index = PLACE_DATA;
|
|
|
|
else if (type == elfcpp::SHT_REL || type == elfcpp::SHT_RELA)
|
|
|
|
index = PLACE_REL;
|
|
|
|
else if ((flags & elfcpp::SHF_EXECINSTR) == 0)
|
|
|
|
index = PLACE_RODATA;
|
|
|
|
else
|
|
|
|
index = PLACE_TEXT;
|
|
|
|
|
|
|
|
// If we don't have a location yet, try to find one based on a
|
|
|
|
// plausible ordering of sections.
|
|
|
|
if (!this->places_[index].have_location)
|
|
|
|
{
|
|
|
|
Place_index follow;
|
|
|
|
switch (index)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
follow = PLACE_MAX;
|
|
|
|
break;
|
|
|
|
case PLACE_RODATA:
|
|
|
|
follow = PLACE_TEXT;
|
|
|
|
break;
|
|
|
|
case PLACE_BSS:
|
|
|
|
follow = PLACE_DATA;
|
|
|
|
break;
|
|
|
|
case PLACE_REL:
|
|
|
|
follow = PLACE_TEXT;
|
|
|
|
break;
|
|
|
|
case PLACE_INTERP:
|
|
|
|
follow = PLACE_TEXT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (follow != PLACE_MAX && this->places_[follow].have_location)
|
|
|
|
{
|
|
|
|
// Set the location of INDEX to the location of FOLLOW. The
|
|
|
|
// location of INDEX will then be incremented by the caller,
|
|
|
|
// so anything in INDEX will continue to be after anything
|
|
|
|
// in FOLLOW.
|
|
|
|
this->places_[index].location = this->places_[follow].location;
|
|
|
|
this->places_[index].have_location = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*pwhere = &this->places_[index].location;
|
|
|
|
bool ret = this->places_[index].have_location;
|
|
|
|
|
|
|
|
// The caller will set the location.
|
|
|
|
this->places_[index].have_location = true;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the iterator being used for sections at the very end of the
|
|
|
|
// linker script.
|
|
|
|
|
|
|
|
Orphan_section_placement::Elements_iterator
|
|
|
|
Orphan_section_placement::last_place() const
|
|
|
|
{
|
|
|
|
gold_assert(this->places_[PLACE_LAST].have_location);
|
|
|
|
return this->places_[PLACE_LAST].location;
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// An element in a SECTIONS clause.
|
|
|
|
|
|
|
|
class Sections_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Sections_element()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
virtual ~Sections_element()
|
|
|
|
{ }
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Return whether an output section is relro.
|
|
|
|
virtual bool
|
|
|
|
is_relro() const
|
|
|
|
{ return false; }
|
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
// Record that an output section is relro.
|
|
|
|
virtual void
|
|
|
|
set_is_relro()
|
|
|
|
{ }
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
// Create any required output sections. The only real
|
|
|
|
// implementation is in Output_section_definition.
|
|
|
|
virtual void
|
|
|
|
create_sections(Layout*)
|
|
|
|
{ }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add any symbol being defined to the symbol table.
|
|
|
|
virtual void
|
|
|
|
add_symbols_to_table(Symbol_table*)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Finalize symbols and check assertions.
|
|
|
|
virtual void
|
2008-02-09 02:22:17 +01:00
|
|
|
finalize_symbols(Symbol_table*, const Layout*, uint64_t*)
|
2008-02-04 06:43:05 +01:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return the output section name to use for an input file name and
|
|
|
|
// section name. This only real implementation is in
|
|
|
|
// Output_section_definition.
|
|
|
|
virtual const char*
|
|
|
|
output_section_name(const char*, const char*, Output_section***)
|
|
|
|
{ return NULL; }
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Initialize OSP with an output section.
|
|
|
|
virtual void
|
|
|
|
orphan_section_init(Orphan_section_placement*,
|
|
|
|
Script_sections::Elements_iterator)
|
|
|
|
{ }
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Set section addresses. This includes applying assignments if the
|
|
|
|
// the expression is an absolute value.
|
|
|
|
virtual void
|
2008-02-14 03:34:22 +01:00
|
|
|
set_section_addresses(Symbol_table*, Layout*, uint64_t*, uint64_t*)
|
2008-02-04 06:43:05 +01:00
|
|
|
{ }
|
|
|
|
|
2008-02-04 07:45:50 +01:00
|
|
|
// Check a constraint (ONLY_IF_RO, etc.) on an output section. If
|
|
|
|
// this section is constrained, and the input sections do not match,
|
|
|
|
// return the constraint, and set *POSD.
|
|
|
|
virtual Section_constraint
|
|
|
|
check_constraint(Output_section_definition**)
|
|
|
|
{ return CONSTRAINT_NONE; }
|
|
|
|
|
|
|
|
// See if this is the alternate output section for a constrained
|
|
|
|
// output section. If it is, transfer the Output_section and return
|
|
|
|
// true. Otherwise return false.
|
|
|
|
virtual bool
|
|
|
|
alternate_constraint(Output_section_definition*, Section_constraint)
|
|
|
|
{ return false; }
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Get the list of segments to use for an allocated section when
|
|
|
|
// using a PHDRS clause. If this is an allocated section, return
|
2008-04-10 03:02:46 +02:00
|
|
|
// the Output_section, and set *PHDRS_LIST (the first parameter) to
|
|
|
|
// the list of PHDRS to which it should be attached. If the PHDRS
|
|
|
|
// were not specified, don't change *PHDRS_LIST. When not returning
|
|
|
|
// NULL, set *ORPHAN (the second parameter) according to whether
|
|
|
|
// this is an orphan section--one that is not mentioned in the
|
|
|
|
// linker script.
|
2008-02-04 23:54:31 +01:00
|
|
|
virtual Output_section*
|
2008-04-10 03:02:46 +02:00
|
|
|
allocate_to_segment(String_list**, bool*)
|
2008-02-04 23:54:31 +01:00
|
|
|
{ return NULL; }
|
|
|
|
|
2008-02-29 01:04:06 +01:00
|
|
|
// Look for an output section by name and return the address, the
|
|
|
|
// load address, the alignment, and the size. This is used when an
|
|
|
|
// expression refers to an output section which was not actually
|
|
|
|
// created. This returns true if the section was found, false
|
|
|
|
// otherwise. The only real definition is for
|
|
|
|
// Output_section_definition.
|
|
|
|
virtual bool
|
|
|
|
get_output_section_info(const char*, uint64_t*, uint64_t*, uint64_t*,
|
|
|
|
uint64_t*) const
|
|
|
|
{ return false; }
|
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
// Return the associated Output_section if there is one.
|
|
|
|
virtual Output_section*
|
|
|
|
get_output_section() const
|
|
|
|
{ return NULL; }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Print the element for debugging purposes.
|
2008-01-23 02:31:13 +01:00
|
|
|
virtual void
|
|
|
|
print(FILE* f) const = 0;
|
|
|
|
};
|
|
|
|
|
|
|
|
// An assignment in a SECTIONS clause outside of an output section.
|
|
|
|
|
|
|
|
class Sections_element_assignment : public Sections_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Sections_element_assignment(const char* name, size_t namelen,
|
|
|
|
Expression* val, bool provide, bool hidden)
|
|
|
|
: assignment_(name, namelen, val, provide, hidden)
|
|
|
|
{ }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add the symbol to the symbol table.
|
|
|
|
void
|
|
|
|
add_symbols_to_table(Symbol_table* symtab)
|
|
|
|
{ this->assignment_.add_to_table(symtab); }
|
|
|
|
|
|
|
|
// Finalize the symbol.
|
|
|
|
void
|
|
|
|
finalize_symbols(Symbol_table* symtab, const Layout* layout,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t* dot_value)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
this->assignment_.finalize_with_dot(symtab, layout, *dot_value, NULL);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set the section address. There is no section here, but if the
|
|
|
|
// value is absolute, we set the symbol. This permits us to use
|
|
|
|
// absolute symbols when setting dot.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table* symtab, Layout* layout,
|
2008-02-14 03:34:22 +01:00
|
|
|
uint64_t* dot_value, uint64_t*)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
this->assignment_.set_if_absolute(symtab, layout, true, *dot_value);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Print for debugging.
|
2008-01-23 02:31:13 +01:00
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " ");
|
|
|
|
this->assignment_.print(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Symbol_assignment assignment_;
|
|
|
|
};
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// An assignment to the dot symbol in a SECTIONS clause outside of an
|
|
|
|
// output section.
|
|
|
|
|
|
|
|
class Sections_element_dot_assignment : public Sections_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Sections_element_dot_assignment(Expression* val)
|
|
|
|
: val_(val)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Finalize the symbol.
|
|
|
|
void
|
|
|
|
finalize_symbols(Symbol_table* symtab, const Layout* layout,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t* dot_value)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
// We ignore the section of the result because outside of an
|
|
|
|
// output section definition the dot symbol is always considered
|
|
|
|
// to be absolute.
|
|
|
|
Output_section* dummy;
|
2008-02-28 05:45:47 +01:00
|
|
|
*dot_value = this->val_->eval_with_dot(symtab, layout, true, *dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
NULL, &dummy);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Update the dot symbol while setting section addresses.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table* symtab, Layout* layout,
|
2008-02-14 03:34:22 +01:00
|
|
|
uint64_t* dot_value, uint64_t* load_address)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* dummy;
|
2008-02-28 05:45:47 +01:00
|
|
|
*dot_value = this->val_->eval_with_dot(symtab, layout, false, *dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
NULL, &dummy);
|
2008-02-14 03:34:22 +01:00
|
|
|
*load_address = *dot_value;
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Print for debugging.
|
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " . = ");
|
|
|
|
this->val_->print(f);
|
|
|
|
fprintf(f, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Expression* val_;
|
|
|
|
};
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// An assertion in a SECTIONS clause outside of an output section.
|
|
|
|
|
|
|
|
class Sections_element_assertion : public Sections_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Sections_element_assertion(Expression* check, const char* message,
|
|
|
|
size_t messagelen)
|
|
|
|
: assertion_(check, message, messagelen)
|
|
|
|
{ }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Check the assertion.
|
|
|
|
void
|
2008-02-09 02:22:17 +01:00
|
|
|
finalize_symbols(Symbol_table* symtab, const Layout* layout, uint64_t*)
|
2008-02-04 06:43:05 +01:00
|
|
|
{ this->assertion_.check(symtab, layout); }
|
|
|
|
|
|
|
|
// Print for debugging.
|
2008-01-23 02:31:13 +01:00
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " ");
|
|
|
|
this->assertion_.print(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Script_assertion assertion_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// An element in an output section in a SECTIONS clause.
|
|
|
|
|
|
|
|
class Output_section_element
|
|
|
|
{
|
|
|
|
public:
|
2008-02-04 06:43:05 +01:00
|
|
|
// A list of input sections.
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
typedef std::list<Output_section::Simple_input_section> Input_section_list;
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
Output_section_element()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
virtual ~Output_section_element()
|
|
|
|
{ }
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
// Return whether this element requires an output section to exist.
|
|
|
|
virtual bool
|
|
|
|
needs_output_section() const
|
|
|
|
{ return false; }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add any symbol being defined to the symbol table.
|
|
|
|
virtual void
|
|
|
|
add_symbols_to_table(Symbol_table*)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Finalize symbols and check assertions.
|
|
|
|
virtual void
|
2008-02-09 02:22:17 +01:00
|
|
|
finalize_symbols(Symbol_table*, const Layout*, uint64_t*, Output_section**)
|
2008-02-04 06:43:05 +01:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return whether this element matches FILE_NAME and SECTION_NAME.
|
|
|
|
// The only real implementation is in Output_section_element_input.
|
|
|
|
virtual bool
|
|
|
|
match_name(const char*, const char*) const
|
|
|
|
{ return false; }
|
|
|
|
|
|
|
|
// Set section addresses. This includes applying assignments if the
|
|
|
|
// the expression is an absolute value.
|
|
|
|
virtual void
|
|
|
|
set_section_addresses(Symbol_table*, Layout*, Output_section*, uint64_t,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t*, Output_section**, std::string*,
|
|
|
|
Input_section_list*)
|
2008-02-04 06:43:05 +01:00
|
|
|
{ }
|
|
|
|
|
|
|
|
// Print the element for debugging purposes.
|
2008-01-23 02:31:13 +01:00
|
|
|
virtual void
|
|
|
|
print(FILE* f) const = 0;
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
protected:
|
|
|
|
// Return a fill string that is LENGTH bytes long, filling it with
|
|
|
|
// FILL.
|
|
|
|
std::string
|
|
|
|
get_fill_string(const std::string* fill, section_size_type length) const;
|
2008-01-23 02:31:13 +01:00
|
|
|
};
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
std::string
|
|
|
|
Output_section_element::get_fill_string(const std::string* fill,
|
|
|
|
section_size_type length) const
|
|
|
|
{
|
|
|
|
std::string this_fill;
|
|
|
|
this_fill.reserve(length);
|
|
|
|
while (this_fill.length() + fill->length() <= length)
|
|
|
|
this_fill += *fill;
|
|
|
|
if (this_fill.length() < length)
|
|
|
|
this_fill.append(*fill, 0, length - this_fill.length());
|
|
|
|
return this_fill;
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// A symbol assignment in an output section.
|
|
|
|
|
|
|
|
class Output_section_element_assignment : public Output_section_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_section_element_assignment(const char* name, size_t namelen,
|
|
|
|
Expression* val, bool provide,
|
|
|
|
bool hidden)
|
|
|
|
: assignment_(name, namelen, val, provide, hidden)
|
|
|
|
{ }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add the symbol to the symbol table.
|
|
|
|
void
|
|
|
|
add_symbols_to_table(Symbol_table* symtab)
|
|
|
|
{ this->assignment_.add_to_table(symtab); }
|
|
|
|
|
|
|
|
// Finalize the symbol.
|
|
|
|
void
|
|
|
|
finalize_symbols(Symbol_table* symtab, const Layout* layout,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t* dot_value, Output_section** dot_section)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
this->assignment_.finalize_with_dot(symtab, layout, *dot_value,
|
|
|
|
*dot_section);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set the section address. There is no section here, but if the
|
|
|
|
// value is absolute, we set the symbol. This permits us to use
|
|
|
|
// absolute symbols when setting dot.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t, uint64_t* dot_value, Output_section**,
|
|
|
|
std::string*, Input_section_list*)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
this->assignment_.set_if_absolute(symtab, layout, true, *dot_value);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Print for debugging.
|
2008-01-23 02:31:13 +01:00
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " ");
|
|
|
|
this->assignment_.print(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Symbol_assignment assignment_;
|
|
|
|
};
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// An assignment to the dot symbol in an output section.
|
|
|
|
|
|
|
|
class Output_section_element_dot_assignment : public Output_section_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_section_element_dot_assignment(Expression* val)
|
|
|
|
: val_(val)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Finalize the symbol.
|
|
|
|
void
|
|
|
|
finalize_symbols(Symbol_table* symtab, const Layout* layout,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t* dot_value, Output_section** dot_section)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-28 05:45:47 +01:00
|
|
|
*dot_value = this->val_->eval_with_dot(symtab, layout, true, *dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
*dot_section, dot_section);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Update the dot symbol while setting section addresses.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t, uint64_t* dot_value, Output_section**,
|
|
|
|
std::string*, Input_section_list*);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Print for debugging.
|
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " . = ");
|
|
|
|
this->val_->print(f);
|
|
|
|
fprintf(f, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Expression* val_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Update the dot symbol while setting section addresses.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_element_dot_assignment::set_section_addresses(
|
|
|
|
Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Output_section* output_section,
|
|
|
|
uint64_t,
|
|
|
|
uint64_t* dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section** dot_section,
|
2008-02-04 06:43:05 +01:00
|
|
|
std::string* fill,
|
|
|
|
Input_section_list*)
|
|
|
|
{
|
2008-02-28 05:45:47 +01:00
|
|
|
uint64_t next_dot = this->val_->eval_with_dot(symtab, layout, false,
|
|
|
|
*dot_value, *dot_section,
|
|
|
|
dot_section);
|
2008-02-04 06:43:05 +01:00
|
|
|
if (next_dot < *dot_value)
|
|
|
|
gold_error(_("dot may not move backward"));
|
|
|
|
if (next_dot > *dot_value && output_section != NULL)
|
|
|
|
{
|
|
|
|
section_size_type length = convert_to_section_size_type(next_dot
|
|
|
|
- *dot_value);
|
|
|
|
Output_section_data* posd;
|
|
|
|
if (fill->empty())
|
2008-05-21 23:37:44 +02:00
|
|
|
posd = new Output_data_zero_fill(length, 0);
|
2008-02-04 06:43:05 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
std::string this_fill = this->get_fill_string(fill, length);
|
|
|
|
posd = new Output_data_const(this_fill, 0);
|
|
|
|
}
|
|
|
|
output_section->add_output_section_data(posd);
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
layout->new_output_section_data_from_script(posd);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
*dot_value = next_dot;
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// An assertion in an output section.
|
|
|
|
|
|
|
|
class Output_section_element_assertion : public Output_section_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_section_element_assertion(Expression* check, const char* message,
|
|
|
|
size_t messagelen)
|
|
|
|
: assertion_(check, message, messagelen)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " ");
|
|
|
|
this->assertion_.print(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Script_assertion assertion_;
|
|
|
|
};
|
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
// We use a special instance of Output_section_data to handle BYTE,
|
|
|
|
// SHORT, etc. This permits forward references to symbols in the
|
|
|
|
// expressions.
|
2008-01-23 02:31:13 +01:00
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
class Output_data_expression : public Output_section_data
|
2008-01-23 02:31:13 +01:00
|
|
|
{
|
|
|
|
public:
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_data_expression(int size, bool is_signed, Expression* val,
|
|
|
|
const Symbol_table* symtab, const Layout* layout,
|
|
|
|
uint64_t dot_value, Output_section* dot_section)
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
: Output_section_data(size, 0, true),
|
2008-02-09 02:22:17 +01:00
|
|
|
is_signed_(is_signed), val_(val), symtab_(symtab),
|
|
|
|
layout_(layout), dot_value_(dot_value), dot_section_(dot_section)
|
2008-01-23 02:31:13 +01:00
|
|
|
{ }
|
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
protected:
|
|
|
|
// Write the data to the output file.
|
2008-02-04 06:43:05 +01:00
|
|
|
void
|
2008-02-09 02:22:17 +01:00
|
|
|
do_write(Output_file*);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
// Write the data to a buffer.
|
2008-01-23 02:31:13 +01:00
|
|
|
void
|
2008-02-09 02:22:17 +01:00
|
|
|
do_write_to_buffer(unsigned char*);
|
2008-01-23 02:31:13 +01:00
|
|
|
|
2008-05-21 23:37:44 +02:00
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** expression")); }
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
private:
|
2008-02-04 06:43:05 +01:00
|
|
|
template<bool big_endian>
|
2008-02-09 02:22:17 +01:00
|
|
|
void
|
|
|
|
endian_write_to_buffer(uint64_t, unsigned char*);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
bool is_signed_;
|
|
|
|
Expression* val_;
|
2008-02-09 02:22:17 +01:00
|
|
|
const Symbol_table* symtab_;
|
|
|
|
const Layout* layout_;
|
|
|
|
uint64_t dot_value_;
|
|
|
|
Output_section* dot_section_;
|
2008-01-23 02:31:13 +01:00
|
|
|
};
|
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
// Write the data element to the output file.
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
void
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_data_expression::do_write(Output_file* of)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
unsigned char* view = of->get_output_view(this->offset(), this->data_size());
|
|
|
|
this->write_to_buffer(view);
|
|
|
|
of->write_output_view(this->offset(), this->data_size(), view);
|
|
|
|
}
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
// Write the data element to a buffer.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_data_expression::do_write_to_buffer(unsigned char* buf)
|
|
|
|
{
|
|
|
|
Output_section* dummy;
|
|
|
|
uint64_t val = this->val_->eval_with_dot(this->symtab_, this->layout_,
|
2008-02-28 05:45:47 +01:00
|
|
|
true, this->dot_value_,
|
2008-02-09 02:22:17 +01:00
|
|
|
this->dot_section_, &dummy);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-02-28 01:18:24 +01:00
|
|
|
if (parameters->target().is_big_endian())
|
2008-02-09 02:22:17 +01:00
|
|
|
this->endian_write_to_buffer<true>(val, buf);
|
2008-02-04 06:43:05 +01:00
|
|
|
else
|
2008-02-09 02:22:17 +01:00
|
|
|
this->endian_write_to_buffer<false>(val, buf);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
template<bool big_endian>
|
2008-02-09 02:22:17 +01:00
|
|
|
void
|
|
|
|
Output_data_expression::endian_write_to_buffer(uint64_t val,
|
|
|
|
unsigned char* buf)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
switch (this->data_size())
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
elfcpp::Swap_unaligned<8, big_endian>::writeval(buf, val);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
elfcpp::Swap_unaligned<16, big_endian>::writeval(buf, val);
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
elfcpp::Swap_unaligned<32, big_endian>::writeval(buf, val);
|
|
|
|
break;
|
|
|
|
case 8:
|
2008-02-28 01:18:24 +01:00
|
|
|
if (parameters->target().get_size() == 32)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
|
|
|
val &= 0xffffffff;
|
|
|
|
if (this->is_signed_ && (val & 0x80000000) != 0)
|
|
|
|
val |= 0xffffffff00000000LL;
|
|
|
|
}
|
|
|
|
elfcpp::Swap_unaligned<64, big_endian>::writeval(buf, val);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
gold_unreachable();
|
|
|
|
}
|
2008-02-09 02:22:17 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// A data item in an output section.
|
|
|
|
|
|
|
|
class Output_section_element_data : public Output_section_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_section_element_data(int size, bool is_signed, Expression* val)
|
|
|
|
: size_(size), is_signed_(is_signed), val_(val)
|
|
|
|
{ }
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
// If there is a data item, then we must create an output section.
|
|
|
|
bool
|
|
|
|
needs_output_section() const
|
|
|
|
{ return true; }
|
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
// Finalize symbols--we just need to update dot.
|
|
|
|
void
|
|
|
|
finalize_symbols(Symbol_table*, const Layout*, uint64_t* dot_value,
|
|
|
|
Output_section**)
|
|
|
|
{ *dot_value += this->size_; }
|
|
|
|
|
|
|
|
// Store the value in the section.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table*, Layout*, Output_section*, uint64_t,
|
|
|
|
uint64_t* dot_value, Output_section**, std::string*,
|
|
|
|
Input_section_list*);
|
|
|
|
|
|
|
|
// Print for debugging.
|
|
|
|
void
|
|
|
|
print(FILE*) const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
// The size in bytes.
|
|
|
|
int size_;
|
|
|
|
// Whether the value is signed.
|
|
|
|
bool is_signed_;
|
|
|
|
// The value.
|
|
|
|
Expression* val_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Store the value in the section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_element_data::set_section_addresses(
|
|
|
|
Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
|
|
|
Output_section* os,
|
|
|
|
uint64_t,
|
|
|
|
uint64_t* dot_value,
|
|
|
|
Output_section** dot_section,
|
|
|
|
std::string*,
|
|
|
|
Input_section_list*)
|
|
|
|
{
|
|
|
|
gold_assert(os != NULL);
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
Output_data_expression* expression =
|
|
|
|
new Output_data_expression(this->size_, this->is_signed_, this->val_,
|
|
|
|
symtab, layout, *dot_value, *dot_section);
|
|
|
|
os->add_output_section_data(expression);
|
|
|
|
layout->new_output_section_data_from_script(expression);
|
2008-02-09 02:22:17 +01:00
|
|
|
*dot_value += this->size_;
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Print for debugging.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_element_data::print(FILE* f) const
|
|
|
|
{
|
|
|
|
const char* s;
|
|
|
|
switch (this->size_)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
s = "BYTE";
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
s = "SHORT";
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
s = "LONG";
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
if (this->is_signed_)
|
|
|
|
s = "SQUAD";
|
|
|
|
else
|
|
|
|
s = "QUAD";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
gold_unreachable();
|
|
|
|
}
|
|
|
|
fprintf(f, " %s(", s);
|
|
|
|
this->val_->print(f);
|
|
|
|
fprintf(f, ")\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
// A fill value setting in an output section.
|
|
|
|
|
|
|
|
class Output_section_element_fill : public Output_section_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_section_element_fill(Expression* val)
|
|
|
|
: val_(val)
|
|
|
|
{ }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Update the fill value while setting section addresses.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
|
2008-02-09 02:22:17 +01:00
|
|
|
uint64_t, uint64_t* dot_value,
|
|
|
|
Output_section** dot_section,
|
|
|
|
std::string* fill, Input_section_list*)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* fill_section;
|
2008-02-28 05:45:47 +01:00
|
|
|
uint64_t fill_val = this->val_->eval_with_dot(symtab, layout, false,
|
2008-02-09 02:22:17 +01:00
|
|
|
*dot_value, *dot_section,
|
|
|
|
&fill_section);
|
|
|
|
if (fill_section != NULL)
|
|
|
|
gold_warning(_("fill value is not absolute"));
|
2008-02-04 06:43:05 +01:00
|
|
|
// FIXME: The GNU linker supports fill values of arbitrary length.
|
|
|
|
unsigned char fill_buff[4];
|
|
|
|
elfcpp::Swap_unaligned<32, true>::writeval(fill_buff, fill_val);
|
|
|
|
fill->assign(reinterpret_cast<char*>(fill_buff), 4);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Print for debugging.
|
2008-01-23 02:31:13 +01:00
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " FILL(");
|
|
|
|
this->val_->print(f);
|
|
|
|
fprintf(f, ")\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
// The new fill value.
|
|
|
|
Expression* val_;
|
|
|
|
};
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Return whether STRING contains a wildcard character. This is used
|
|
|
|
// to speed up matching.
|
|
|
|
|
|
|
|
static inline bool
|
|
|
|
is_wildcard_string(const std::string& s)
|
|
|
|
{
|
|
|
|
return strpbrk(s.c_str(), "?*[") != NULL;
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// An input section specification in an output section
|
|
|
|
|
|
|
|
class Output_section_element_input : public Output_section_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Output_section_element_input(const Input_section_spec* spec, bool keep);
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Finalize symbols--just update the value of the dot symbol.
|
|
|
|
void
|
2008-02-09 02:22:17 +01:00
|
|
|
finalize_symbols(Symbol_table*, const Layout*, uint64_t* dot_value,
|
|
|
|
Output_section** dot_section)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
|
|
|
*dot_value = this->final_dot_value_;
|
2008-02-09 02:22:17 +01:00
|
|
|
*dot_section = this->final_dot_section_;
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// See whether we match FILE_NAME and SECTION_NAME as an input
|
|
|
|
// section.
|
|
|
|
bool
|
|
|
|
match_name(const char* file_name, const char* section_name) const;
|
|
|
|
|
|
|
|
// Set the section address.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
|
|
|
|
uint64_t subalign, uint64_t* dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section**, std::string* fill,
|
|
|
|
Input_section_list*);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Print for debugging.
|
2008-01-23 02:31:13 +01:00
|
|
|
void
|
|
|
|
print(FILE* f) const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
// An input section pattern.
|
|
|
|
struct Input_section_pattern
|
|
|
|
{
|
|
|
|
std::string pattern;
|
2008-02-04 06:43:05 +01:00
|
|
|
bool pattern_is_wildcard;
|
2008-01-23 02:31:13 +01:00
|
|
|
Sort_wildcard sort;
|
|
|
|
|
|
|
|
Input_section_pattern(const char* patterna, size_t patternlena,
|
|
|
|
Sort_wildcard sorta)
|
2008-02-04 06:43:05 +01:00
|
|
|
: pattern(patterna, patternlena),
|
|
|
|
pattern_is_wildcard(is_wildcard_string(this->pattern)),
|
|
|
|
sort(sorta)
|
2008-01-23 02:31:13 +01:00
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::vector<Input_section_pattern> Input_section_patterns;
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Filename_exclusions is a pair of filename pattern and a bool
|
|
|
|
// indicating whether the filename is a wildcard.
|
|
|
|
typedef std::vector<std::pair<std::string, bool> > Filename_exclusions;
|
|
|
|
|
|
|
|
// Return whether STRING matches PATTERN, where IS_WILDCARD_PATTERN
|
|
|
|
// indicates whether this is a wildcard pattern.
|
|
|
|
static inline bool
|
|
|
|
match(const char* string, const char* pattern, bool is_wildcard_pattern)
|
|
|
|
{
|
|
|
|
return (is_wildcard_pattern
|
|
|
|
? fnmatch(pattern, string, 0) == 0
|
|
|
|
: strcmp(string, pattern) == 0);
|
|
|
|
}
|
2008-01-23 02:31:13 +01:00
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// See if we match a file name.
|
|
|
|
bool
|
|
|
|
match_file_name(const char* file_name) const;
|
|
|
|
|
|
|
|
// The file name pattern. If this is the empty string, we match all
|
|
|
|
// files.
|
2008-01-23 02:31:13 +01:00
|
|
|
std::string filename_pattern_;
|
2008-02-04 06:43:05 +01:00
|
|
|
// Whether the file name pattern is a wildcard.
|
|
|
|
bool filename_is_wildcard_;
|
2008-01-23 02:31:13 +01:00
|
|
|
// How the file names should be sorted. This may only be
|
|
|
|
// SORT_WILDCARD_NONE or SORT_WILDCARD_BY_NAME.
|
|
|
|
Sort_wildcard filename_sort_;
|
|
|
|
// The list of file names to exclude.
|
|
|
|
Filename_exclusions filename_exclusions_;
|
|
|
|
// The list of input section patterns.
|
|
|
|
Input_section_patterns input_section_patterns_;
|
|
|
|
// Whether to keep this section when garbage collecting.
|
|
|
|
bool keep_;
|
2008-02-04 06:43:05 +01:00
|
|
|
// The value of dot after including all matching sections.
|
|
|
|
uint64_t final_dot_value_;
|
2008-02-09 02:22:17 +01:00
|
|
|
// The section where dot is defined after including all matching
|
|
|
|
// sections.
|
|
|
|
Output_section* final_dot_section_;
|
2008-01-23 02:31:13 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
// Construct Output_section_element_input. The parser records strings
|
|
|
|
// as pointers into a copy of the script file, which will go away when
|
|
|
|
// parsing is complete. We make sure they are in std::string objects.
|
|
|
|
|
|
|
|
Output_section_element_input::Output_section_element_input(
|
|
|
|
const Input_section_spec* spec,
|
|
|
|
bool keep)
|
2008-02-04 06:43:05 +01:00
|
|
|
: filename_pattern_(),
|
|
|
|
filename_is_wildcard_(false),
|
2008-01-23 02:31:13 +01:00
|
|
|
filename_sort_(spec->file.sort),
|
|
|
|
filename_exclusions_(),
|
|
|
|
input_section_patterns_(),
|
2008-02-04 06:43:05 +01:00
|
|
|
keep_(keep),
|
2008-02-09 02:22:17 +01:00
|
|
|
final_dot_value_(0),
|
|
|
|
final_dot_section_(NULL)
|
2008-01-23 02:31:13 +01:00
|
|
|
{
|
2008-02-04 06:43:05 +01:00
|
|
|
// The filename pattern "*" is common, and matches all files. Turn
|
|
|
|
// it into the empty string.
|
|
|
|
if (spec->file.name.length != 1 || spec->file.name.value[0] != '*')
|
|
|
|
this->filename_pattern_.assign(spec->file.name.value,
|
|
|
|
spec->file.name.length);
|
|
|
|
this->filename_is_wildcard_ = is_wildcard_string(this->filename_pattern_);
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
if (spec->input_sections.exclude != NULL)
|
|
|
|
{
|
|
|
|
for (String_list::const_iterator p =
|
|
|
|
spec->input_sections.exclude->begin();
|
|
|
|
p != spec->input_sections.exclude->end();
|
|
|
|
++p)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
|
|
|
bool is_wildcard = is_wildcard_string(*p);
|
|
|
|
this->filename_exclusions_.push_back(std::make_pair(*p,
|
|
|
|
is_wildcard));
|
|
|
|
}
|
2008-01-23 02:31:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (spec->input_sections.sections != NULL)
|
|
|
|
{
|
|
|
|
Input_section_patterns& isp(this->input_section_patterns_);
|
|
|
|
for (String_sort_list::const_iterator p =
|
|
|
|
spec->input_sections.sections->begin();
|
|
|
|
p != spec->input_sections.sections->end();
|
|
|
|
++p)
|
|
|
|
isp.push_back(Input_section_pattern(p->name.value, p->name.length,
|
|
|
|
p->sort));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// See whether we match FILE_NAME.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_section_element_input::match_file_name(const char* file_name) const
|
|
|
|
{
|
|
|
|
if (!this->filename_pattern_.empty())
|
|
|
|
{
|
|
|
|
// If we were called with no filename, we refuse to match a
|
|
|
|
// pattern which requires a file name.
|
|
|
|
if (file_name == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!match(file_name, this->filename_pattern_.c_str(),
|
|
|
|
this->filename_is_wildcard_))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (file_name != NULL)
|
|
|
|
{
|
|
|
|
// Now we have to see whether FILE_NAME matches one of the
|
|
|
|
// exclusion patterns, if any.
|
|
|
|
for (Filename_exclusions::const_iterator p =
|
|
|
|
this->filename_exclusions_.begin();
|
|
|
|
p != this->filename_exclusions_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if (match(file_name, p->first.c_str(), p->second))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// See whether we match FILE_NAME and SECTION_NAME.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_section_element_input::match_name(const char* file_name,
|
|
|
|
const char* section_name) const
|
|
|
|
{
|
|
|
|
if (!this->match_file_name(file_name))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// If there are no section name patterns, then we match.
|
|
|
|
if (this->input_section_patterns_.empty())
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// See whether we match the section name patterns.
|
|
|
|
for (Input_section_patterns::const_iterator p =
|
|
|
|
this->input_section_patterns_.begin();
|
|
|
|
p != this->input_section_patterns_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if (match(section_name, p->pattern.c_str(), p->pattern_is_wildcard))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We didn't match any section names, so we didn't match.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Information we use to sort the input sections.
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
class Input_section_info
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
public:
|
|
|
|
Input_section_info(const Output_section::Simple_input_section& input_section)
|
|
|
|
: input_section_(input_section), section_name_(),
|
|
|
|
size_(0), addralign_(1)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return the simple input section.
|
|
|
|
const Output_section::Simple_input_section&
|
|
|
|
input_section() const
|
|
|
|
{ return this->input_section_; }
|
|
|
|
|
|
|
|
// Return the object.
|
|
|
|
Relobj*
|
|
|
|
relobj() const
|
|
|
|
{ return this->input_section_.relobj(); }
|
|
|
|
|
|
|
|
// Return the section index.
|
|
|
|
unsigned int
|
|
|
|
shndx()
|
|
|
|
{ return this->input_section_.shndx(); }
|
|
|
|
|
|
|
|
// Return the section name.
|
|
|
|
const std::string&
|
|
|
|
section_name() const
|
|
|
|
{ return this->section_name_; }
|
|
|
|
|
|
|
|
// Set the section name.
|
|
|
|
void
|
|
|
|
set_section_name(const std::string name)
|
|
|
|
{ this->section_name_ = name; }
|
|
|
|
|
|
|
|
// Return the section size.
|
|
|
|
uint64_t
|
|
|
|
size() const
|
|
|
|
{ return this->size_; }
|
|
|
|
|
|
|
|
// Set the section size.
|
|
|
|
void
|
|
|
|
set_size(uint64_t size)
|
|
|
|
{ this->size_ = size; }
|
|
|
|
|
|
|
|
// Return the address alignment.
|
|
|
|
uint64_t
|
|
|
|
addralign() const
|
|
|
|
{ return this->addralign_; }
|
|
|
|
|
|
|
|
// Set the address alignment.
|
|
|
|
void
|
|
|
|
set_addralign(uint64_t addralign)
|
|
|
|
{ this->addralign_ = addralign; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Input section, can be a relaxed section.
|
|
|
|
Output_section::Simple_input_section input_section_;
|
|
|
|
// Name of the section.
|
|
|
|
std::string section_name_;
|
|
|
|
// Section size.
|
|
|
|
uint64_t size_;
|
|
|
|
// Address alignment.
|
|
|
|
uint64_t addralign_;
|
2008-02-04 06:43:05 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
// A class to sort the input sections.
|
|
|
|
|
|
|
|
class Input_section_sorter
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Input_section_sorter(Sort_wildcard filename_sort, Sort_wildcard section_sort)
|
|
|
|
: filename_sort_(filename_sort), section_sort_(section_sort)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
bool
|
|
|
|
operator()(const Input_section_info&, const Input_section_info&) const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
Sort_wildcard filename_sort_;
|
|
|
|
Sort_wildcard section_sort_;
|
|
|
|
};
|
|
|
|
|
|
|
|
bool
|
|
|
|
Input_section_sorter::operator()(const Input_section_info& isi1,
|
|
|
|
const Input_section_info& isi2) const
|
|
|
|
{
|
|
|
|
if (this->section_sort_ == SORT_WILDCARD_BY_NAME
|
|
|
|
|| this->section_sort_ == SORT_WILDCARD_BY_NAME_BY_ALIGNMENT
|
|
|
|
|| (this->section_sort_ == SORT_WILDCARD_BY_ALIGNMENT_BY_NAME
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
&& isi1.addralign() == isi2.addralign()))
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
if (isi1.section_name() != isi2.section_name())
|
|
|
|
return isi1.section_name() < isi2.section_name();
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
if (this->section_sort_ == SORT_WILDCARD_BY_ALIGNMENT
|
|
|
|
|| this->section_sort_ == SORT_WILDCARD_BY_NAME_BY_ALIGNMENT
|
|
|
|
|| this->section_sort_ == SORT_WILDCARD_BY_ALIGNMENT_BY_NAME)
|
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
if (isi1.addralign() != isi2.addralign())
|
|
|
|
return isi1.addralign() < isi2.addralign();
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
if (this->filename_sort_ == SORT_WILDCARD_BY_NAME)
|
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
if (isi1.relobj()->name() != isi2.relobj()->name())
|
|
|
|
return (isi1.relobj()->name() < isi2.relobj()->name());
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Otherwise we leave them in the same order.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the section address. Look in INPUT_SECTIONS for sections which
|
|
|
|
// match this spec, sort them as specified, and add them to the output
|
|
|
|
// section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_element_input::set_section_addresses(
|
|
|
|
Symbol_table*,
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
Layout* layout,
|
2008-02-04 06:43:05 +01:00
|
|
|
Output_section* output_section,
|
|
|
|
uint64_t subalign,
|
|
|
|
uint64_t* dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section** dot_section,
|
2008-02-04 06:43:05 +01:00
|
|
|
std::string* fill,
|
|
|
|
Input_section_list* input_sections)
|
|
|
|
{
|
|
|
|
// We build a list of sections which match each
|
|
|
|
// Input_section_pattern.
|
|
|
|
|
|
|
|
typedef std::vector<std::vector<Input_section_info> > Matching_sections;
|
|
|
|
size_t input_pattern_count = this->input_section_patterns_.size();
|
|
|
|
if (input_pattern_count == 0)
|
|
|
|
input_pattern_count = 1;
|
|
|
|
Matching_sections matching_sections(input_pattern_count);
|
|
|
|
|
|
|
|
// Look through the list of sections for this output section. Add
|
|
|
|
// each one which matches to one of the elements of
|
|
|
|
// MATCHING_SECTIONS.
|
|
|
|
|
|
|
|
Input_section_list::iterator p = input_sections->begin();
|
|
|
|
while (p != input_sections->end())
|
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
Relobj* relobj = p->relobj();
|
|
|
|
unsigned int shndx = p->shndx();
|
|
|
|
Input_section_info isi(*p);
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Calling section_name and section_addralign is not very
|
|
|
|
// efficient.
|
|
|
|
|
|
|
|
// Lock the object so that we can get information about the
|
|
|
|
// section. This is OK since we know we are single-threaded
|
|
|
|
// here.
|
|
|
|
{
|
|
|
|
const Task* task = reinterpret_cast<const Task*>(-1);
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
Task_lock_obj<Object> tl(task, relobj);
|
|
|
|
|
|
|
|
isi.set_section_name(relobj->section_name(shndx));
|
|
|
|
if (p->is_relaxed_input_section())
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(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_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-10 01:18:19 +02:00
|
|
|
{
|
|
|
|
// We use current data size because relxed section sizes may not
|
|
|
|
// have finalized yet.
|
|
|
|
isi.set_size(p->relaxed_input_section()->current_data_size());
|
|
|
|
isi.set_addralign(p->relaxed_input_section()->addralign());
|
|
|
|
}
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
else
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(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_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-10 01:18:19 +02:00
|
|
|
{
|
|
|
|
isi.set_size(relobj->section_size(shndx));
|
|
|
|
isi.set_addralign(relobj->section_addralign(shndx));
|
|
|
|
}
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
if (!this->match_file_name(relobj->name().c_str()))
|
2008-02-04 06:43:05 +01:00
|
|
|
++p;
|
|
|
|
else if (this->input_section_patterns_.empty())
|
|
|
|
{
|
|
|
|
matching_sections[0].push_back(isi);
|
|
|
|
p = input_sections->erase(p);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
for (i = 0; i < input_pattern_count; ++i)
|
|
|
|
{
|
|
|
|
const Input_section_pattern&
|
|
|
|
isp(this->input_section_patterns_[i]);
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
if (match(isi.section_name().c_str(), isp.pattern.c_str(),
|
2008-02-04 06:43:05 +01:00
|
|
|
isp.pattern_is_wildcard))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i >= this->input_section_patterns_.size())
|
|
|
|
++p;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
matching_sections[i].push_back(isi);
|
|
|
|
p = input_sections->erase(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Look through MATCHING_SECTIONS. Sort each one as specified,
|
|
|
|
// using a stable sort so that we get the default order when
|
|
|
|
// sections are otherwise equal. Add each input section to the
|
|
|
|
// output section.
|
|
|
|
|
2009-10-16 07:00:29 +02:00
|
|
|
uint64_t dot = *dot_value;
|
2008-02-04 06:43:05 +01:00
|
|
|
for (size_t i = 0; i < input_pattern_count; ++i)
|
|
|
|
{
|
|
|
|
if (matching_sections[i].empty())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
gold_assert(output_section != NULL);
|
|
|
|
|
|
|
|
const Input_section_pattern& isp(this->input_section_patterns_[i]);
|
|
|
|
if (isp.sort != SORT_WILDCARD_NONE
|
|
|
|
|| this->filename_sort_ != SORT_WILDCARD_NONE)
|
|
|
|
std::stable_sort(matching_sections[i].begin(),
|
|
|
|
matching_sections[i].end(),
|
|
|
|
Input_section_sorter(this->filename_sort_,
|
|
|
|
isp.sort));
|
|
|
|
|
|
|
|
for (std::vector<Input_section_info>::const_iterator p =
|
|
|
|
matching_sections[i].begin();
|
|
|
|
p != matching_sections[i].end();
|
|
|
|
++p)
|
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
uint64_t this_subalign = p->addralign();
|
2008-02-04 06:43:05 +01:00
|
|
|
if (this_subalign < subalign)
|
|
|
|
this_subalign = subalign;
|
|
|
|
|
2009-10-16 07:00:29 +02:00
|
|
|
uint64_t address = align_address(dot, this_subalign);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2009-10-16 07:00:29 +02:00
|
|
|
if (address > dot && !fill->empty())
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
|
|
|
section_size_type length =
|
2009-10-16 07:00:29 +02:00
|
|
|
convert_to_section_size_type(address - dot);
|
2008-02-04 06:43:05 +01:00
|
|
|
std::string this_fill = this->get_fill_string(fill, length);
|
|
|
|
Output_section_data* posd = new Output_data_const(this_fill, 0);
|
|
|
|
output_section->add_output_section_data(posd);
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
layout->new_output_section_data_from_script(posd);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
output_section->add_input_section_for_script(p->input_section(),
|
|
|
|
p->size(),
|
2008-02-04 06:43:05 +01:00
|
|
|
this_subalign);
|
|
|
|
|
2009-10-16 07:00:29 +02:00
|
|
|
dot = address + p->size();
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-16 07:00:29 +02:00
|
|
|
// An SHF_TLS/SHT_NOBITS section does not take up any
|
|
|
|
// address space.
|
|
|
|
if (output_section == NULL
|
|
|
|
|| (output_section->flags() & elfcpp::SHF_TLS) == 0
|
|
|
|
|| output_section->type() != elfcpp::SHT_NOBITS)
|
|
|
|
*dot_value = dot;
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
this->final_dot_value_ = *dot_value;
|
2008-02-09 02:22:17 +01:00
|
|
|
this->final_dot_section_ = *dot_section;
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Print for debugging.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_element_input::print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " ");
|
|
|
|
|
|
|
|
if (this->keep_)
|
|
|
|
fprintf(f, "KEEP(");
|
|
|
|
|
|
|
|
if (!this->filename_pattern_.empty())
|
|
|
|
{
|
|
|
|
bool need_close_paren = false;
|
|
|
|
switch (this->filename_sort_)
|
|
|
|
{
|
|
|
|
case SORT_WILDCARD_NONE:
|
|
|
|
break;
|
|
|
|
case SORT_WILDCARD_BY_NAME:
|
|
|
|
fprintf(f, "SORT_BY_NAME(");
|
|
|
|
need_close_paren = true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
gold_unreachable();
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(f, "%s", this->filename_pattern_.c_str());
|
|
|
|
|
|
|
|
if (need_close_paren)
|
|
|
|
fprintf(f, ")");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!this->input_section_patterns_.empty()
|
|
|
|
|| !this->filename_exclusions_.empty())
|
|
|
|
{
|
|
|
|
fprintf(f, "(");
|
|
|
|
|
|
|
|
bool need_space = false;
|
|
|
|
if (!this->filename_exclusions_.empty())
|
|
|
|
{
|
|
|
|
fprintf(f, "EXCLUDE_FILE(");
|
|
|
|
bool need_comma = false;
|
|
|
|
for (Filename_exclusions::const_iterator p =
|
|
|
|
this->filename_exclusions_.begin();
|
|
|
|
p != this->filename_exclusions_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if (need_comma)
|
|
|
|
fprintf(f, ", ");
|
2008-02-04 06:43:05 +01:00
|
|
|
fprintf(f, "%s", p->first.c_str());
|
2008-01-23 02:31:13 +01:00
|
|
|
need_comma = true;
|
|
|
|
}
|
|
|
|
fprintf(f, ")");
|
|
|
|
need_space = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (Input_section_patterns::const_iterator p =
|
|
|
|
this->input_section_patterns_.begin();
|
|
|
|
p != this->input_section_patterns_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if (need_space)
|
|
|
|
fprintf(f, " ");
|
|
|
|
|
|
|
|
int close_parens = 0;
|
|
|
|
switch (p->sort)
|
|
|
|
{
|
|
|
|
case SORT_WILDCARD_NONE:
|
|
|
|
break;
|
|
|
|
case SORT_WILDCARD_BY_NAME:
|
|
|
|
fprintf(f, "SORT_BY_NAME(");
|
|
|
|
close_parens = 1;
|
|
|
|
break;
|
|
|
|
case SORT_WILDCARD_BY_ALIGNMENT:
|
|
|
|
fprintf(f, "SORT_BY_ALIGNMENT(");
|
|
|
|
close_parens = 1;
|
|
|
|
break;
|
|
|
|
case SORT_WILDCARD_BY_NAME_BY_ALIGNMENT:
|
|
|
|
fprintf(f, "SORT_BY_NAME(SORT_BY_ALIGNMENT(");
|
|
|
|
close_parens = 2;
|
|
|
|
break;
|
|
|
|
case SORT_WILDCARD_BY_ALIGNMENT_BY_NAME:
|
|
|
|
fprintf(f, "SORT_BY_ALIGNMENT(SORT_BY_NAME(");
|
|
|
|
close_parens = 2;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
gold_unreachable();
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(f, "%s", p->pattern.c_str());
|
|
|
|
|
|
|
|
for (int i = 0; i < close_parens; ++i)
|
|
|
|
fprintf(f, ")");
|
|
|
|
|
|
|
|
need_space = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(f, ")");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this->keep_)
|
|
|
|
fprintf(f, ")");
|
|
|
|
|
|
|
|
fprintf(f, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
// An output section.
|
|
|
|
|
|
|
|
class Output_section_definition : public Sections_element
|
|
|
|
{
|
|
|
|
public:
|
2008-02-04 06:43:05 +01:00
|
|
|
typedef Output_section_element::Input_section_list Input_section_list;
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
Output_section_definition(const char* name, size_t namelen,
|
|
|
|
const Parser_output_section_header* header);
|
|
|
|
|
|
|
|
// Finish the output section with the information in the trailer.
|
|
|
|
void
|
|
|
|
finish(const Parser_output_section_trailer* trailer);
|
|
|
|
|
|
|
|
// Add a symbol to be defined.
|
|
|
|
void
|
|
|
|
add_symbol_assignment(const char* name, size_t length, Expression* value,
|
|
|
|
bool provide, bool hidden);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Add an assignment to the special dot symbol.
|
|
|
|
void
|
|
|
|
add_dot_assignment(Expression* value);
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Add an assertion.
|
|
|
|
void
|
|
|
|
add_assertion(Expression* check, const char* message, size_t messagelen);
|
|
|
|
|
|
|
|
// Add a data item to the current output section.
|
|
|
|
void
|
|
|
|
add_data(int size, bool is_signed, Expression* val);
|
|
|
|
|
|
|
|
// Add a setting for the fill value.
|
|
|
|
void
|
|
|
|
add_fill(Expression* val);
|
|
|
|
|
|
|
|
// Add an input section specification.
|
|
|
|
void
|
|
|
|
add_input_section(const Input_section_spec* spec, bool keep);
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Return whether the output section is relro.
|
|
|
|
bool
|
|
|
|
is_relro() const
|
|
|
|
{ return this->is_relro_; }
|
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
// Record that the output section is relro.
|
|
|
|
void
|
|
|
|
set_is_relro()
|
|
|
|
{ this->is_relro_ = true; }
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
// Create any required output sections.
|
|
|
|
void
|
|
|
|
create_sections(Layout*);
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add any symbols being defined to the symbol table.
|
|
|
|
void
|
|
|
|
add_symbols_to_table(Symbol_table* symtab);
|
|
|
|
|
|
|
|
// Finalize symbols and check assertions.
|
|
|
|
void
|
2008-02-09 02:22:17 +01:00
|
|
|
finalize_symbols(Symbol_table*, const Layout*, uint64_t*);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Return the output section name to use for an input file name and
|
|
|
|
// section name.
|
|
|
|
const char*
|
|
|
|
output_section_name(const char* file_name, const char* section_name,
|
|
|
|
Output_section***);
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Initialize OSP with an output section.
|
|
|
|
void
|
|
|
|
orphan_section_init(Orphan_section_placement* osp,
|
|
|
|
Script_sections::Elements_iterator p)
|
|
|
|
{ osp->output_section_init(this->name_, this->output_section_, p); }
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Set the section address.
|
|
|
|
void
|
|
|
|
set_section_addresses(Symbol_table* symtab, Layout* layout,
|
2008-02-14 03:34:22 +01:00
|
|
|
uint64_t* dot_value, uint64_t* load_address);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-02-04 07:45:50 +01:00
|
|
|
// Check a constraint (ONLY_IF_RO, etc.) on an output section. If
|
|
|
|
// this section is constrained, and the input sections do not match,
|
|
|
|
// return the constraint, and set *POSD.
|
|
|
|
Section_constraint
|
|
|
|
check_constraint(Output_section_definition** posd);
|
|
|
|
|
|
|
|
// See if this is the alternate output section for a constrained
|
|
|
|
// output section. If it is, transfer the Output_section and return
|
|
|
|
// true. Otherwise return false.
|
|
|
|
bool
|
|
|
|
alternate_constraint(Output_section_definition*, Section_constraint);
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Get the list of segments to use for an allocated section when
|
2008-04-10 03:02:46 +02:00
|
|
|
// using a PHDRS clause.
|
2008-02-04 23:54:31 +01:00
|
|
|
Output_section*
|
2008-04-10 03:02:46 +02:00
|
|
|
allocate_to_segment(String_list** phdrs_list, bool* orphan);
|
2008-02-04 23:54:31 +01:00
|
|
|
|
2008-02-29 01:04:06 +01:00
|
|
|
// Look for an output section by name and return the address, the
|
|
|
|
// load address, the alignment, and the size. This is used when an
|
|
|
|
// expression refers to an output section which was not actually
|
|
|
|
// created. This returns true if the section was found, false
|
|
|
|
// otherwise.
|
|
|
|
bool
|
|
|
|
get_output_section_info(const char*, uint64_t*, uint64_t*, uint64_t*,
|
|
|
|
uint64_t*) const;
|
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
// Return the associated Output_section if there is one.
|
|
|
|
Output_section*
|
|
|
|
get_output_section() const
|
|
|
|
{ return this->output_section_; }
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Print the contents to the FILE. This is for debugging.
|
|
|
|
void
|
|
|
|
print(FILE*) const;
|
|
|
|
|
|
|
|
private:
|
|
|
|
typedef std::vector<Output_section_element*> Output_section_elements;
|
|
|
|
|
|
|
|
// The output section name.
|
|
|
|
std::string name_;
|
|
|
|
// The address. This may be NULL.
|
|
|
|
Expression* address_;
|
|
|
|
// The load address. This may be NULL.
|
|
|
|
Expression* load_address_;
|
|
|
|
// The alignment. This may be NULL.
|
|
|
|
Expression* align_;
|
|
|
|
// The input section alignment. This may be NULL.
|
|
|
|
Expression* subalign_;
|
2008-02-04 07:45:50 +01:00
|
|
|
// The constraint, if any.
|
|
|
|
Section_constraint constraint_;
|
2008-01-23 02:31:13 +01:00
|
|
|
// The fill value. This may be NULL.
|
|
|
|
Expression* fill_;
|
2008-02-04 23:54:31 +01:00
|
|
|
// The list of segments this section should go into. This may be
|
|
|
|
// NULL.
|
|
|
|
String_list* phdrs_;
|
2008-01-23 02:31:13 +01:00
|
|
|
// The list of elements defining the section.
|
|
|
|
Output_section_elements elements_;
|
2008-02-04 06:43:05 +01:00
|
|
|
// The Output_section created for this definition. This will be
|
|
|
|
// NULL if none was created.
|
|
|
|
Output_section* output_section_;
|
2008-02-29 01:04:06 +01:00
|
|
|
// The address after it has been evaluated.
|
|
|
|
uint64_t evaluated_address_;
|
|
|
|
// The load address after it has been evaluated.
|
|
|
|
uint64_t evaluated_load_address_;
|
|
|
|
// The alignment after it has been evaluated.
|
|
|
|
uint64_t evaluated_addralign_;
|
2008-08-13 09:37:46 +02:00
|
|
|
// The output section is relro.
|
|
|
|
bool is_relro_;
|
2008-01-23 02:31:13 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
// Constructor.
|
|
|
|
|
|
|
|
Output_section_definition::Output_section_definition(
|
|
|
|
const char* name,
|
|
|
|
size_t namelen,
|
|
|
|
const Parser_output_section_header* header)
|
|
|
|
: name_(name, namelen),
|
|
|
|
address_(header->address),
|
|
|
|
load_address_(header->load_address),
|
|
|
|
align_(header->align),
|
|
|
|
subalign_(header->subalign),
|
2008-02-04 07:45:50 +01:00
|
|
|
constraint_(header->constraint),
|
2008-01-23 02:31:13 +01:00
|
|
|
fill_(NULL),
|
2008-02-04 23:54:31 +01:00
|
|
|
phdrs_(NULL),
|
2008-02-04 06:43:05 +01:00
|
|
|
elements_(),
|
2008-08-13 09:37:46 +02:00
|
|
|
output_section_(NULL),
|
|
|
|
evaluated_address_(0),
|
|
|
|
evaluated_load_address_(0),
|
|
|
|
evaluated_addralign_(0),
|
|
|
|
is_relro_(false)
|
2008-01-23 02:31:13 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finish an output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::finish(const Parser_output_section_trailer* trailer)
|
|
|
|
{
|
|
|
|
this->fill_ = trailer->fill;
|
2008-02-04 23:54:31 +01:00
|
|
|
this->phdrs_ = trailer->phdrs;
|
2008-01-23 02:31:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add a symbol to be defined.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::add_symbol_assignment(const char* name,
|
|
|
|
size_t length,
|
|
|
|
Expression* value,
|
|
|
|
bool provide,
|
|
|
|
bool hidden)
|
|
|
|
{
|
|
|
|
Output_section_element* p = new Output_section_element_assignment(name,
|
|
|
|
length,
|
|
|
|
value,
|
|
|
|
provide,
|
|
|
|
hidden);
|
|
|
|
this->elements_.push_back(p);
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add an assignment to the special dot symbol.
|
2008-01-23 02:31:13 +01:00
|
|
|
|
|
|
|
void
|
2008-02-04 06:43:05 +01:00
|
|
|
Output_section_definition::add_dot_assignment(Expression* value)
|
|
|
|
{
|
|
|
|
Output_section_element* p = new Output_section_element_dot_assignment(value);
|
|
|
|
this->elements_.push_back(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add an assertion.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::add_assertion(Expression* check,
|
|
|
|
const char* message,
|
2008-01-23 02:31:13 +01:00
|
|
|
size_t messagelen)
|
|
|
|
{
|
|
|
|
Output_section_element* p = new Output_section_element_assertion(check,
|
|
|
|
message,
|
|
|
|
messagelen);
|
|
|
|
this->elements_.push_back(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a data item to the current output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::add_data(int size, bool is_signed, Expression* val)
|
|
|
|
{
|
|
|
|
Output_section_element* p = new Output_section_element_data(size, is_signed,
|
|
|
|
val);
|
|
|
|
this->elements_.push_back(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a setting for the fill value.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::add_fill(Expression* val)
|
|
|
|
{
|
|
|
|
Output_section_element* p = new Output_section_element_fill(val);
|
|
|
|
this->elements_.push_back(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add an input section specification.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::add_input_section(const Input_section_spec* spec,
|
|
|
|
bool keep)
|
|
|
|
{
|
|
|
|
Output_section_element* p = new Output_section_element_input(spec, keep);
|
|
|
|
this->elements_.push_back(p);
|
|
|
|
}
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
// Create any required output sections. We need an output section if
|
|
|
|
// there is a data statement here.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::create_sections(Layout* layout)
|
|
|
|
{
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
return;
|
|
|
|
for (Output_section_elements::const_iterator p = this->elements_.begin();
|
|
|
|
p != this->elements_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if ((*p)->needs_output_section())
|
|
|
|
{
|
|
|
|
const char* name = this->name_.c_str();
|
|
|
|
this->output_section_ = layout->make_output_section_for_script(name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add any symbols being defined to the symbol table.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::add_symbols_to_table(Symbol_table* symtab)
|
|
|
|
{
|
|
|
|
for (Output_section_elements::iterator p = this->elements_.begin();
|
|
|
|
p != this->elements_.end();
|
|
|
|
++p)
|
|
|
|
(*p)->add_symbols_to_table(symtab);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finalize symbols and check assertions.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::finalize_symbols(Symbol_table* symtab,
|
|
|
|
const Layout* layout,
|
|
|
|
uint64_t* dot_value)
|
|
|
|
{
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
*dot_value = this->output_section_->address();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
uint64_t address = *dot_value;
|
|
|
|
if (this->address_ != NULL)
|
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* dummy;
|
2008-02-28 05:45:47 +01:00
|
|
|
address = this->address_->eval_with_dot(symtab, layout, true,
|
2008-02-09 02:22:17 +01:00
|
|
|
*dot_value, NULL,
|
2008-02-04 06:43:05 +01:00
|
|
|
&dummy);
|
|
|
|
}
|
|
|
|
if (this->align_ != NULL)
|
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* dummy;
|
2008-02-28 05:45:47 +01:00
|
|
|
uint64_t align = this->align_->eval_with_dot(symtab, layout, true,
|
2008-02-04 06:43:05 +01:00
|
|
|
*dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
NULL,
|
2008-02-04 06:43:05 +01:00
|
|
|
&dummy);
|
|
|
|
address = align_address(address, align);
|
|
|
|
}
|
|
|
|
*dot_value = address;
|
|
|
|
}
|
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* dot_section = this->output_section_;
|
2008-02-04 06:43:05 +01:00
|
|
|
for (Output_section_elements::iterator p = this->elements_.begin();
|
|
|
|
p != this->elements_.end();
|
|
|
|
++p)
|
2008-02-09 02:22:17 +01:00
|
|
|
(*p)->finalize_symbols(symtab, layout, dot_value, &dot_section);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Return the output section name to use for an input section name.
|
|
|
|
|
|
|
|
const char*
|
|
|
|
Output_section_definition::output_section_name(const char* file_name,
|
|
|
|
const char* section_name,
|
|
|
|
Output_section*** slot)
|
|
|
|
{
|
|
|
|
// Ask each element whether it matches NAME.
|
|
|
|
for (Output_section_elements::const_iterator p = this->elements_.begin();
|
|
|
|
p != this->elements_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if ((*p)->match_name(file_name, section_name))
|
|
|
|
{
|
|
|
|
// We found a match for NAME, which means that it should go
|
|
|
|
// into this output section.
|
|
|
|
*slot = &this->output_section_;
|
|
|
|
return this->name_.c_str();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We don't know about this section name.
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the section address. Note that the OUTPUT_SECTION_ field will
|
|
|
|
// be NULL if no input sections were mapped to this output section.
|
|
|
|
// We still have to adjust dot and process symbol assignments.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::set_section_addresses(Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
2008-02-14 03:34:22 +01:00
|
|
|
uint64_t* dot_value,
|
|
|
|
uint64_t* load_address)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
|
|
|
uint64_t address;
|
2008-02-09 02:22:17 +01:00
|
|
|
if (this->address_ == NULL)
|
|
|
|
address = *dot_value;
|
2008-02-04 06:43:05 +01:00
|
|
|
else
|
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* dummy;
|
2008-02-28 05:45:47 +01:00
|
|
|
address = this->address_->eval_with_dot(symtab, layout, true,
|
|
|
|
*dot_value, NULL, &dummy);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t align;
|
|
|
|
if (this->align_ == NULL)
|
|
|
|
{
|
|
|
|
if (this->output_section_ == NULL)
|
|
|
|
align = 0;
|
|
|
|
else
|
|
|
|
align = this->output_section_->addralign();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* align_section;
|
2008-02-28 05:45:47 +01:00
|
|
|
align = this->align_->eval_with_dot(symtab, layout, true, *dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
NULL, &align_section);
|
|
|
|
if (align_section != NULL)
|
|
|
|
gold_warning(_("alignment of section %s is not absolute"),
|
|
|
|
this->name_.c_str());
|
2008-02-04 06:43:05 +01:00
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
this->output_section_->set_addralign(align);
|
|
|
|
}
|
|
|
|
|
|
|
|
address = align_address(address, align);
|
|
|
|
|
2008-02-14 03:34:22 +01:00
|
|
|
uint64_t start_address = address;
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
*dot_value = address;
|
|
|
|
|
|
|
|
// The address of non-SHF_ALLOC sections is forced to zero,
|
|
|
|
// regardless of what the linker script wants.
|
|
|
|
if (this->output_section_ != NULL
|
|
|
|
&& (this->output_section_->flags() & elfcpp::SHF_ALLOC) != 0)
|
|
|
|
this->output_section_->set_address(address);
|
|
|
|
|
2008-02-29 01:04:06 +01:00
|
|
|
this->evaluated_address_ = address;
|
|
|
|
this->evaluated_addralign_ = align;
|
|
|
|
|
|
|
|
if (this->load_address_ == NULL)
|
|
|
|
this->evaluated_load_address_ = address;
|
|
|
|
else
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* dummy;
|
2009-06-24 21:00:15 +02:00
|
|
|
uint64_t laddr =
|
2008-02-28 05:45:47 +01:00
|
|
|
this->load_address_->eval_with_dot(symtab, layout, true, *dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
this->output_section_, &dummy);
|
2008-02-29 01:04:06 +01:00
|
|
|
if (this->output_section_ != NULL)
|
2009-06-24 21:00:15 +02:00
|
|
|
this->output_section_->set_load_address(laddr);
|
|
|
|
this->evaluated_load_address_ = laddr;
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t subalign;
|
|
|
|
if (this->subalign_ == NULL)
|
|
|
|
subalign = 0;
|
|
|
|
else
|
|
|
|
{
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* subalign_section;
|
2008-02-28 05:45:47 +01:00
|
|
|
subalign = this->subalign_->eval_with_dot(symtab, layout, true,
|
|
|
|
*dot_value, NULL,
|
|
|
|
&subalign_section);
|
2008-02-09 02:22:17 +01:00
|
|
|
if (subalign_section != NULL)
|
|
|
|
gold_warning(_("subalign of section %s is not absolute"),
|
|
|
|
this->name_.c_str());
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
std::string fill;
|
|
|
|
if (this->fill_ != NULL)
|
|
|
|
{
|
|
|
|
// FIXME: The GNU linker supports fill values of arbitrary
|
|
|
|
// length.
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* fill_section;
|
2008-02-28 05:45:47 +01:00
|
|
|
uint64_t fill_val = this->fill_->eval_with_dot(symtab, layout, true,
|
2008-02-04 06:43:05 +01:00
|
|
|
*dot_value,
|
2008-02-09 02:22:17 +01:00
|
|
|
NULL,
|
|
|
|
&fill_section);
|
|
|
|
if (fill_section != NULL)
|
|
|
|
gold_warning(_("fill of section %s is not absolute"),
|
|
|
|
this->name_.c_str());
|
2008-02-04 06:43:05 +01:00
|
|
|
unsigned char fill_buff[4];
|
|
|
|
elfcpp::Swap_unaligned<32, true>::writeval(fill_buff, fill_val);
|
|
|
|
fill.assign(reinterpret_cast<char*>(fill_buff), 4);
|
|
|
|
}
|
|
|
|
|
|
|
|
Input_section_list input_sections;
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
{
|
|
|
|
// Get the list of input sections attached to this output
|
|
|
|
// section. This will leave the output section with only
|
|
|
|
// Output_section_data entries.
|
|
|
|
address += this->output_section_->get_input_sections(address,
|
|
|
|
fill,
|
|
|
|
&input_sections);
|
|
|
|
*dot_value = address;
|
|
|
|
}
|
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
Output_section* dot_section = this->output_section_;
|
2008-02-04 06:43:05 +01:00
|
|
|
for (Output_section_elements::iterator p = this->elements_.begin();
|
|
|
|
p != this->elements_.end();
|
|
|
|
++p)
|
|
|
|
(*p)->set_section_addresses(symtab, layout, this->output_section_,
|
2008-02-09 02:22:17 +01:00
|
|
|
subalign, dot_value, &dot_section, &fill,
|
|
|
|
&input_sections);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
gold_assert(input_sections.empty());
|
2008-02-14 03:34:22 +01:00
|
|
|
|
|
|
|
if (this->load_address_ == NULL || this->output_section_ == NULL)
|
|
|
|
*load_address = *dot_value;
|
|
|
|
else
|
|
|
|
*load_address = (this->output_section_->load_address()
|
|
|
|
+ (*dot_value - start_address));
|
2008-08-13 09:37:46 +02:00
|
|
|
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
{
|
|
|
|
if (this->is_relro_)
|
|
|
|
this->output_section_->set_is_relro();
|
|
|
|
else
|
|
|
|
this->output_section_->clear_is_relro();
|
|
|
|
}
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
2008-02-04 07:45:50 +01:00
|
|
|
// Check a constraint (ONLY_IF_RO, etc.) on an output section. If
|
|
|
|
// this section is constrained, and the input sections do not match,
|
|
|
|
// return the constraint, and set *POSD.
|
|
|
|
|
|
|
|
Section_constraint
|
|
|
|
Output_section_definition::check_constraint(Output_section_definition** posd)
|
|
|
|
{
|
|
|
|
switch (this->constraint_)
|
|
|
|
{
|
|
|
|
case CONSTRAINT_NONE:
|
|
|
|
return CONSTRAINT_NONE;
|
|
|
|
|
|
|
|
case CONSTRAINT_ONLY_IF_RO:
|
|
|
|
if (this->output_section_ != NULL
|
|
|
|
&& (this->output_section_->flags() & elfcpp::SHF_WRITE) != 0)
|
|
|
|
{
|
|
|
|
*posd = this;
|
|
|
|
return CONSTRAINT_ONLY_IF_RO;
|
|
|
|
}
|
|
|
|
return CONSTRAINT_NONE;
|
|
|
|
|
|
|
|
case CONSTRAINT_ONLY_IF_RW:
|
|
|
|
if (this->output_section_ != NULL
|
|
|
|
&& (this->output_section_->flags() & elfcpp::SHF_WRITE) == 0)
|
|
|
|
{
|
|
|
|
*posd = this;
|
|
|
|
return CONSTRAINT_ONLY_IF_RW;
|
|
|
|
}
|
|
|
|
return CONSTRAINT_NONE;
|
|
|
|
|
|
|
|
case CONSTRAINT_SPECIAL:
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
gold_error(_("SPECIAL constraints are not implemented"));
|
|
|
|
return CONSTRAINT_NONE;
|
|
|
|
|
|
|
|
default:
|
|
|
|
gold_unreachable();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// See if this is the alternate output section for a constrained
|
|
|
|
// output section. If it is, transfer the Output_section and return
|
|
|
|
// true. Otherwise return false.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_section_definition::alternate_constraint(
|
|
|
|
Output_section_definition* posd,
|
|
|
|
Section_constraint constraint)
|
|
|
|
{
|
|
|
|
if (this->name_ != posd->name_)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
switch (constraint)
|
|
|
|
{
|
|
|
|
case CONSTRAINT_ONLY_IF_RO:
|
|
|
|
if (this->constraint_ != CONSTRAINT_ONLY_IF_RW)
|
|
|
|
return false;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONSTRAINT_ONLY_IF_RW:
|
|
|
|
if (this->constraint_ != CONSTRAINT_ONLY_IF_RO)
|
|
|
|
return false;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
gold_unreachable();
|
|
|
|
}
|
|
|
|
|
|
|
|
// We have found the alternate constraint. We just need to move
|
|
|
|
// over the Output_section. When constraints are used properly,
|
|
|
|
// THIS should not have an output_section pointer, as all the input
|
|
|
|
// sections should have matched the other definition.
|
|
|
|
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
gold_error(_("mismatched definition for constrained sections"));
|
|
|
|
|
|
|
|
this->output_section_ = posd->output_section_;
|
|
|
|
posd->output_section_ = NULL;
|
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
if (this->is_relro_)
|
|
|
|
this->output_section_->set_is_relro();
|
|
|
|
else
|
|
|
|
this->output_section_->clear_is_relro();
|
|
|
|
|
2008-02-04 07:45:50 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Get the list of segments to use for an allocated section when using
|
2008-04-10 03:02:46 +02:00
|
|
|
// a PHDRS clause.
|
2008-02-04 23:54:31 +01:00
|
|
|
|
|
|
|
Output_section*
|
2008-04-10 03:02:46 +02:00
|
|
|
Output_section_definition::allocate_to_segment(String_list** phdrs_list,
|
|
|
|
bool* orphan)
|
2008-02-04 23:54:31 +01:00
|
|
|
{
|
|
|
|
if (this->output_section_ == NULL)
|
|
|
|
return NULL;
|
|
|
|
if ((this->output_section_->flags() & elfcpp::SHF_ALLOC) == 0)
|
|
|
|
return NULL;
|
2008-04-10 03:02:46 +02:00
|
|
|
*orphan = false;
|
2008-02-04 23:54:31 +01:00
|
|
|
if (this->phdrs_ != NULL)
|
|
|
|
*phdrs_list = this->phdrs_;
|
|
|
|
return this->output_section_;
|
|
|
|
}
|
|
|
|
|
2008-02-29 01:04:06 +01:00
|
|
|
// Look for an output section by name and return the address, the load
|
|
|
|
// address, the alignment, and the size. This is used when an
|
|
|
|
// expression refers to an output section which was not actually
|
|
|
|
// created. This returns true if the section was found, false
|
|
|
|
// otherwise.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Output_section_definition::get_output_section_info(const char* name,
|
|
|
|
uint64_t* address,
|
|
|
|
uint64_t* load_address,
|
|
|
|
uint64_t* addralign,
|
|
|
|
uint64_t* size) const
|
|
|
|
{
|
|
|
|
if (this->name_ != name)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
{
|
|
|
|
*address = this->output_section_->address();
|
|
|
|
if (this->output_section_->has_load_address())
|
|
|
|
*load_address = this->output_section_->load_address();
|
|
|
|
else
|
|
|
|
*load_address = *address;
|
|
|
|
*addralign = this->output_section_->addralign();
|
|
|
|
*size = this->output_section_->current_data_size();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*address = this->evaluated_address_;
|
|
|
|
*load_address = this->evaluated_load_address_;
|
|
|
|
*addralign = this->evaluated_addralign_;
|
|
|
|
*size = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Print for debugging.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_section_definition::print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " %s ", this->name_.c_str());
|
|
|
|
|
|
|
|
if (this->address_ != NULL)
|
|
|
|
{
|
|
|
|
this->address_->print(f);
|
|
|
|
fprintf(f, " ");
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(f, ": ");
|
|
|
|
|
|
|
|
if (this->load_address_ != NULL)
|
|
|
|
{
|
|
|
|
fprintf(f, "AT(");
|
|
|
|
this->load_address_->print(f);
|
|
|
|
fprintf(f, ") ");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this->align_ != NULL)
|
|
|
|
{
|
|
|
|
fprintf(f, "ALIGN(");
|
|
|
|
this->align_->print(f);
|
|
|
|
fprintf(f, ") ");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this->subalign_ != NULL)
|
|
|
|
{
|
|
|
|
fprintf(f, "SUBALIGN(");
|
|
|
|
this->subalign_->print(f);
|
|
|
|
fprintf(f, ") ");
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(f, "{\n");
|
|
|
|
|
|
|
|
for (Output_section_elements::const_iterator p = this->elements_.begin();
|
|
|
|
p != this->elements_.end();
|
|
|
|
++p)
|
|
|
|
(*p)->print(f);
|
|
|
|
|
|
|
|
fprintf(f, " }");
|
|
|
|
|
|
|
|
if (this->fill_ != NULL)
|
|
|
|
{
|
|
|
|
fprintf(f, " = ");
|
|
|
|
this->fill_->print(f);
|
|
|
|
}
|
|
|
|
|
2008-02-05 00:53:15 +01:00
|
|
|
if (this->phdrs_ != NULL)
|
|
|
|
{
|
|
|
|
for (String_list::const_iterator p = this->phdrs_->begin();
|
|
|
|
p != this->phdrs_->end();
|
|
|
|
++p)
|
|
|
|
fprintf(f, " :%s", p->c_str());
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
fprintf(f, "\n");
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// An output section created to hold orphaned input sections. These
|
|
|
|
// do not actually appear in linker scripts. However, for convenience
|
|
|
|
// when setting the output section addresses, we put a marker to these
|
|
|
|
// sections in the appropriate place in the list of SECTIONS elements.
|
|
|
|
|
|
|
|
class Orphan_output_section : public Sections_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Orphan_output_section(Output_section* os)
|
|
|
|
: os_(os)
|
|
|
|
{ }
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Return whether the orphan output section is relro. We can just
|
|
|
|
// check the output section because we always set the flag, if
|
|
|
|
// needed, just after we create the Orphan_output_section.
|
2008-02-04 06:43:05 +01:00
|
|
|
bool
|
2009-03-19 06:51:49 +01:00
|
|
|
is_relro() const
|
|
|
|
{ return this->os_->is_relro(); }
|
|
|
|
|
|
|
|
// Initialize OSP with an output section. This should have been
|
|
|
|
// done already.
|
|
|
|
void
|
|
|
|
orphan_section_init(Orphan_section_placement*,
|
|
|
|
Script_sections::Elements_iterator)
|
|
|
|
{ gold_unreachable(); }
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Set section addresses.
|
|
|
|
void
|
2008-02-14 03:34:22 +01:00
|
|
|
set_section_addresses(Symbol_table*, Layout*, uint64_t*, uint64_t*);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Get the list of segments to use for an allocated section when
|
2008-04-10 03:02:46 +02:00
|
|
|
// using a PHDRS clause.
|
2008-02-04 23:54:31 +01:00
|
|
|
Output_section*
|
2008-04-10 03:02:46 +02:00
|
|
|
allocate_to_segment(String_list**, bool*);
|
2008-02-04 23:54:31 +01:00
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
// Return the associated Output_section.
|
|
|
|
Output_section*
|
|
|
|
get_output_section() const
|
|
|
|
{ return this->os_; }
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Print for debugging.
|
|
|
|
void
|
|
|
|
print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " marker for orphaned output section %s\n",
|
|
|
|
this->os_->name());
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
Output_section* os_;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Set section addresses.
|
|
|
|
|
|
|
|
void
|
|
|
|
Orphan_output_section::set_section_addresses(Symbol_table*, Layout*,
|
2008-02-14 03:34:22 +01:00
|
|
|
uint64_t* dot_value,
|
|
|
|
uint64_t* load_address)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
typedef std::list<Output_section::Simple_input_section> Input_section_list;
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-02-14 03:34:22 +01:00
|
|
|
bool have_load_address = *load_address != *dot_value;
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
uint64_t address = *dot_value;
|
|
|
|
address = align_address(address, this->os_->addralign());
|
|
|
|
|
|
|
|
if ((this->os_->flags() & elfcpp::SHF_ALLOC) != 0)
|
2008-02-14 03:34:22 +01:00
|
|
|
{
|
|
|
|
this->os_->set_address(address);
|
|
|
|
if (have_load_address)
|
|
|
|
this->os_->set_load_address(align_address(*load_address,
|
|
|
|
this->os_->addralign()));
|
|
|
|
}
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
Input_section_list input_sections;
|
|
|
|
address += this->os_->get_input_sections(address, "", &input_sections);
|
|
|
|
|
|
|
|
for (Input_section_list::iterator p = input_sections.begin();
|
|
|
|
p != input_sections.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
uint64_t addralign;
|
|
|
|
uint64_t size;
|
|
|
|
|
|
|
|
// We know what are single-threaded, so it is OK to lock the
|
|
|
|
// object.
|
|
|
|
{
|
|
|
|
const Task* task = reinterpret_cast<const Task*>(-1);
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
Task_lock_obj<Object> tl(task, p->relobj());
|
|
|
|
addralign = p->relobj()->section_addralign(p->shndx());
|
|
|
|
if (p->is_relaxed_input_section())
|
2009-10-09 Doug Kwan <dougkwan@google.com>
* layout.cc (Layout::make_output_section): Call target hook to make
ordinary output section.
(Layout::finalize): Adjust parameter list of call the
Target::may_relax().
* layout.h (class Layout::section_list): New method.
* merge.h (Output_merge_base::entsize): Change visibility to public.
(Output_merge_base::is_string, Output_merge_base::do_is_string):
New methods.
(Output_merge_string::do_is_string): New method.
* object.cc (Sized_relobj::do_setup): renamed from
Sized_relobj::set_up.
* object.h (Sized_relobj::adjust_shndx,
Sized_relobj::initializ_input_to_output_maps,
Sized_relobj::free_input_to_output_maps): Change visibilities to
protected.
(Sized_relobj::setup): Virtualize.
(Sized_relobj::do_setup): New method declaration.
(Sized_relobj::invalidate_section_offset,
Sized_relobj::do_invalidate_section_offset): New method decfinitions.
(Sized_relobj::elf_file, Sized_relobj::local_values): New methods.
* options.cc (parse_int): New function.
* options.h (parse_int): New declaration.
(DEFINE_int): New macro.
(stub_group_size): New option.
* output.cc (Output_section::Output_section): Initialize memebers
merge_section_map_, merge_section_by_properties_map_,
relaxed_input_section_map_, is_relaxed_input_section_map_valid_.
(Output_section::add_input_section): Handled deferred code-fill
generation and remove an old comment.
(Output_section::add_relaxed_input_section): New method definition.
(Output_section::add_merge_input_section): Use merge section by
properties map to speed to search. Update merge section maps
as appropriate.
(Output_section::build_relaxation_map): New method definition.
(Output_section::convert_input_sections_in_list_to_relaxed_sections):
Same.
(Output_section::relax_input_section): Renamed to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of pointers to relaxed sections.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section): New method definitions.
(Output_section::is_input_address_mapped,
Output_section::output_offset, Output_section::output_address):
Use output section data maps to speed up searching.
(Output_section::find_starting_output_address): Add comments.
(Output_section::do_write,
Output_section::write_to_postprocessing_buffer): Do code-fill
generation as appropriate.
(Output_section::get_input_sections): Invalidate relaxed input section
map.
(Output_section::restore_states): Adjust type of checkpoint .
Invalidate relaxed input section map.
* output.h (Output_merge_base): New class declaration.
(Input_section_specifier): New class defintion.
(class Output_relaxed_input_section) Change base class to
Output_section_data_build.
(Output_relaxed_input_section::Output_relaxed_input_section): Adjust
base class initializer.
(Output_section::add_relaxed_input_section): New method declaration.
(Output_section::Input_section): Change visibility to protected.
(Output_section::Input_section::relobj,
Output_section::Input_section::shndx): Handle relaxed input sections.
Output_section::input_sections) Change visibility to protected. Also
define overload to return a non-const pointer.
(Output_section::Merge_section_properties): New class defintion.
(Output_section::Merge_section_by_properties_map,
Output_section::Output_section_data_by_input_section_map,
Output_section::Relaxation_map): New types.
(Output_section::relax_input_section): Rename method to
Output_section::convert_input_sections_to_relaxed_sections and change
interface to take a vector of relaxed section pointers.
(Output_section::find_merge_section,
Output_section::find_relaxed_input_section,
Output_section::build_relaxation_map,
Output_section::convert_input_sections_in_list_to_relaxed_sections):
New method declarations.
(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_,
Output_section::generate_code_fills_at_write_): New data members.
* script-sections.cc
(Output_section_element_input::set_section_addresses): Call
current_data_size and addralign methods of relaxed input sections.
(Orphan_output_section::set_section_addresses): Call current_data_size
and addralign methods of relaxed input sections.
* symtab.cc (Symbol_table::compute_final_value): Extract template
from the body of Symbol_table::sized_finalize_symbol.
(Symbol_table::sized_finalized_symbol): Call
Symbol_table::compute_final_value.
* symtab.h (Symbol_table::Compute_final_value_status): New enum type.
(Symbol_table::compute_final_value): New templated method declaration.
* target.cc (Target::do_make_output_section): New method defintion.
* target.h (Target::make_output_section): New method declaration.
(Target::relax): Add more parameters for input objects, symbol table
and layout. Adjust call to do_relax.
(Target::do_make_output_section): New method declaration.
(Target::do_relax): Add parameters for input objects, symbol table
and layout.
2009-10-10 01:18:19 +02:00
|
|
|
// We use current data size because relxed section sizes may not
|
|
|
|
// have finalized yet.
|
|
|
|
size = p->relaxed_input_section()->current_data_size();
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
else
|
|
|
|
size = p->relobj()->section_size(p->shndx());
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
address = align_address(address, addralign);
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
this->os_->add_input_section_for_script(*p, size, addralign);
|
2008-02-04 06:43:05 +01:00
|
|
|
address += size;
|
|
|
|
}
|
|
|
|
|
2009-10-16 07:00:29 +02:00
|
|
|
// An SHF_TLS/SHT_NOBITS section does not take up any address space.
|
|
|
|
if (this->os_ == NULL
|
|
|
|
|| (this->os_->flags() & elfcpp::SHF_TLS) == 0
|
|
|
|
|| this->os_->type() != elfcpp::SHT_NOBITS)
|
|
|
|
{
|
|
|
|
if (!have_load_address)
|
|
|
|
*load_address = address;
|
|
|
|
else
|
|
|
|
*load_address += address - *dot_value;
|
2008-02-14 03:34:22 +01:00
|
|
|
|
2009-10-16 07:00:29 +02:00
|
|
|
*dot_value = address;
|
|
|
|
}
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Get the list of segments to use for an allocated section when using
|
|
|
|
// a PHDRS clause. If this is an allocated section, return the
|
|
|
|
// Output_section. We don't change the list of segments.
|
|
|
|
|
|
|
|
Output_section*
|
2008-04-10 03:02:46 +02:00
|
|
|
Orphan_output_section::allocate_to_segment(String_list**, bool* orphan)
|
2008-02-04 23:54:31 +01:00
|
|
|
{
|
|
|
|
if ((this->os_->flags() & elfcpp::SHF_ALLOC) == 0)
|
|
|
|
return NULL;
|
2008-04-10 03:02:46 +02:00
|
|
|
*orphan = true;
|
2008-02-04 23:54:31 +01:00
|
|
|
return this->os_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Class Phdrs_element. A program header from a PHDRS clause.
|
|
|
|
|
|
|
|
class Phdrs_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Phdrs_element(const char* name, size_t namelen, unsigned int type,
|
|
|
|
bool includes_filehdr, bool includes_phdrs,
|
|
|
|
bool is_flags_valid, unsigned int flags,
|
|
|
|
Expression* load_address)
|
|
|
|
: name_(name, namelen), type_(type), includes_filehdr_(includes_filehdr),
|
|
|
|
includes_phdrs_(includes_phdrs), is_flags_valid_(is_flags_valid),
|
|
|
|
flags_(flags), load_address_(load_address), load_address_value_(0),
|
|
|
|
segment_(NULL)
|
|
|
|
{ }
|
|
|
|
|
|
|
|
// Return the name of this segment.
|
|
|
|
const std::string&
|
|
|
|
name() const
|
|
|
|
{ return this->name_; }
|
|
|
|
|
|
|
|
// Return the type of the segment.
|
|
|
|
unsigned int
|
|
|
|
type() const
|
|
|
|
{ return this->type_; }
|
|
|
|
|
|
|
|
// Whether to include the file header.
|
|
|
|
bool
|
|
|
|
includes_filehdr() const
|
|
|
|
{ return this->includes_filehdr_; }
|
|
|
|
|
|
|
|
// Whether to include the program headers.
|
|
|
|
bool
|
|
|
|
includes_phdrs() const
|
|
|
|
{ return this->includes_phdrs_; }
|
|
|
|
|
|
|
|
// Return whether there is a load address.
|
|
|
|
bool
|
|
|
|
has_load_address() const
|
|
|
|
{ return this->load_address_ != NULL; }
|
|
|
|
|
|
|
|
// Evaluate the load address expression if there is one.
|
|
|
|
void
|
|
|
|
eval_load_address(Symbol_table* symtab, Layout* layout)
|
|
|
|
{
|
|
|
|
if (this->load_address_ != NULL)
|
2008-02-28 05:45:47 +01:00
|
|
|
this->load_address_value_ = this->load_address_->eval(symtab, layout,
|
|
|
|
true);
|
2008-02-04 23:54:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Return the load address.
|
|
|
|
uint64_t
|
|
|
|
load_address() const
|
|
|
|
{
|
|
|
|
gold_assert(this->load_address_ != NULL);
|
|
|
|
return this->load_address_value_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create the segment.
|
|
|
|
Output_segment*
|
|
|
|
create_segment(Layout* layout)
|
|
|
|
{
|
|
|
|
this->segment_ = layout->make_output_segment(this->type_, this->flags_);
|
|
|
|
return this->segment_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the segment.
|
|
|
|
Output_segment*
|
|
|
|
segment()
|
|
|
|
{ return this->segment_; }
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
// Release the segment.
|
|
|
|
void
|
|
|
|
release_segment()
|
|
|
|
{ this->segment_ = NULL; }
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Set the segment flags if appropriate.
|
|
|
|
void
|
|
|
|
set_flags_if_valid()
|
|
|
|
{
|
|
|
|
if (this->is_flags_valid_)
|
|
|
|
this->segment_->set_flags(this->flags_);
|
|
|
|
}
|
|
|
|
|
2008-02-05 00:53:15 +01:00
|
|
|
// Print for debugging.
|
|
|
|
void
|
|
|
|
print(FILE*) const;
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
private:
|
|
|
|
// The name used in the script.
|
|
|
|
std::string name_;
|
|
|
|
// The type of the segment (PT_LOAD, etc.).
|
|
|
|
unsigned int type_;
|
|
|
|
// Whether this segment includes the file header.
|
|
|
|
bool includes_filehdr_;
|
|
|
|
// Whether this segment includes the section headers.
|
|
|
|
bool includes_phdrs_;
|
|
|
|
// Whether the flags were explicitly specified.
|
|
|
|
bool is_flags_valid_;
|
|
|
|
// The flags for this segment (PF_R, etc.) if specified.
|
|
|
|
unsigned int flags_;
|
|
|
|
// The expression for the load address for this segment. This may
|
|
|
|
// be NULL.
|
|
|
|
Expression* load_address_;
|
|
|
|
// The actual load address from evaluating the expression.
|
|
|
|
uint64_t load_address_value_;
|
|
|
|
// The segment itself.
|
|
|
|
Output_segment* segment_;
|
|
|
|
};
|
|
|
|
|
2008-02-05 00:53:15 +01:00
|
|
|
// Print for debugging.
|
|
|
|
|
|
|
|
void
|
|
|
|
Phdrs_element::print(FILE* f) const
|
|
|
|
{
|
|
|
|
fprintf(f, " %s 0x%x", this->name_.c_str(), this->type_);
|
|
|
|
if (this->includes_filehdr_)
|
|
|
|
fprintf(f, " FILEHDR");
|
|
|
|
if (this->includes_phdrs_)
|
|
|
|
fprintf(f, " PHDRS");
|
|
|
|
if (this->is_flags_valid_)
|
|
|
|
fprintf(f, " FLAGS(%u)", this->flags_);
|
|
|
|
if (this->load_address_ != NULL)
|
|
|
|
{
|
|
|
|
fprintf(f, " AT(");
|
|
|
|
this->load_address_->print(f);
|
|
|
|
fprintf(f, ")");
|
|
|
|
}
|
|
|
|
fprintf(f, ";\n");
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Class Script_sections.
|
|
|
|
|
|
|
|
Script_sections::Script_sections()
|
|
|
|
: saw_sections_clause_(false),
|
|
|
|
in_sections_clause_(false),
|
|
|
|
sections_elements_(NULL),
|
2008-02-04 23:54:31 +01:00
|
|
|
output_section_(NULL),
|
2008-08-13 09:37:46 +02:00
|
|
|
phdrs_elements_(NULL),
|
2009-03-19 06:51:49 +01:00
|
|
|
orphan_section_placement_(NULL),
|
|
|
|
data_segment_align_start_(),
|
|
|
|
saw_data_segment_align_(false),
|
2009-10-16 Doug Kwan <dougkwan@google.com>
* expression.cc (class Segment_start_expression): New class definition.
(Segment_start_expression::value): New method definition.
(script_exp_function_segment_start): Return a new
Segment_start_expression.
* gold/script-c.h (script_saw_segment_start_expression): New function
prototype.
* script-sections.cc (Script_sections::Script_sections): Initialize
SAW_SEGMENT_START_EXPRESSION_ to false.
(Script_sections::set_section_addresses): Use -Ttext, -Tdata
and -Tbbs options to specify section addresses if given in
command line and no SEGMENT_START expression is seen in a script.
* script-sections.h (Script_sections::saw_segment_start_expression,
Script_sections::set_saw_segment_start_expression): New method
definition.
(Script_sections::saw_segment_start_expression_): New data member
declaration.
* script.cc (script_saw_segment_start_expression): New function.
* yyscript.y (SEGMENT_START): Call script_saw_segment_start_expression.
* testsuite/Makefile.am (check_SCRIPTS): Add script_test_6.sh,
script_test_7.sh and script_test_8.sh.
(check_DATA): Add script_test_6.stdout, script_test_7.stdout and
script_test_8.stdout.
(MOSTLYCLEANFILES): Add script_test_6, script_test_7 and script_test_8.
(script_test_6, script_test_6.stdout, script_test_7,
script_test_7.stdout, script_test_8, script_test_8.stdout): New rules.
* Makefile.in: Regenerate.
* testsuite/script_test_6.sh: New file.
* testsuite/script_test_6.t: Same.
* testsuite/script_test_7.sh: Same.
* testsuite/script_test_7.t: Same.
* testsuite/script_test_8.sh: Same.
2009-10-16 20:56:07 +02:00
|
|
|
saw_relro_end_(false),
|
|
|
|
saw_segment_start_expression_(false)
|
2008-01-23 02:31:13 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start a SECTIONS clause.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::start_sections()
|
|
|
|
{
|
|
|
|
gold_assert(!this->in_sections_clause_ && this->output_section_ == NULL);
|
|
|
|
this->saw_sections_clause_ = true;
|
|
|
|
this->in_sections_clause_ = true;
|
|
|
|
if (this->sections_elements_ == NULL)
|
|
|
|
this->sections_elements_ = new Sections_elements;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finish a SECTIONS clause.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::finish_sections()
|
|
|
|
{
|
|
|
|
gold_assert(this->in_sections_clause_ && this->output_section_ == NULL);
|
|
|
|
this->in_sections_clause_ = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a symbol to be defined.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_symbol_assignment(const char* name, size_t length,
|
|
|
|
Expression* val, bool provide,
|
|
|
|
bool hidden)
|
|
|
|
{
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
this->output_section_->add_symbol_assignment(name, length, val,
|
|
|
|
provide, hidden);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Sections_element* p = new Sections_element_assignment(name, length,
|
|
|
|
val, provide,
|
|
|
|
hidden);
|
|
|
|
this->sections_elements_->push_back(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add an assignment to the special dot symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_dot_assignment(Expression* val)
|
|
|
|
{
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
this->output_section_->add_dot_assignment(val);
|
|
|
|
else
|
|
|
|
{
|
2009-10-16 07:19:07 +02:00
|
|
|
// The GNU linker permits assignments to . to appears outside of
|
|
|
|
// a SECTIONS clause, and treats it as appearing inside, so
|
|
|
|
// sections_elements_ may be NULL here.
|
|
|
|
if (this->sections_elements_ == NULL)
|
|
|
|
{
|
|
|
|
this->sections_elements_ = new Sections_elements;
|
|
|
|
this->saw_sections_clause_ = true;
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
Sections_element* p = new Sections_element_dot_assignment(val);
|
|
|
|
this->sections_elements_->push_back(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Add an assertion.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_assertion(Expression* check, const char* message,
|
|
|
|
size_t messagelen)
|
|
|
|
{
|
|
|
|
if (this->output_section_ != NULL)
|
|
|
|
this->output_section_->add_assertion(check, message, messagelen);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Sections_element* p = new Sections_element_assertion(check, message,
|
|
|
|
messagelen);
|
|
|
|
this->sections_elements_->push_back(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start processing entries for an output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::start_output_section(
|
|
|
|
const char* name,
|
|
|
|
size_t namelen,
|
|
|
|
const Parser_output_section_header *header)
|
|
|
|
{
|
|
|
|
Output_section_definition* posd = new Output_section_definition(name,
|
|
|
|
namelen,
|
|
|
|
header);
|
|
|
|
this->sections_elements_->push_back(posd);
|
|
|
|
gold_assert(this->output_section_ == NULL);
|
|
|
|
this->output_section_ = posd;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Stop processing entries for an output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::finish_output_section(
|
|
|
|
const Parser_output_section_trailer* trailer)
|
|
|
|
{
|
|
|
|
gold_assert(this->output_section_ != NULL);
|
|
|
|
this->output_section_->finish(trailer);
|
|
|
|
this->output_section_ = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a data item to the current output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_data(int size, bool is_signed, Expression* val)
|
|
|
|
{
|
|
|
|
gold_assert(this->output_section_ != NULL);
|
|
|
|
this->output_section_->add_data(size, is_signed, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add a fill value setting to the current output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_fill(Expression* val)
|
|
|
|
{
|
|
|
|
gold_assert(this->output_section_ != NULL);
|
|
|
|
this->output_section_->add_fill(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add an input section specification to the current output section.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_input_section(const Input_section_spec* spec, bool keep)
|
|
|
|
{
|
|
|
|
gold_assert(this->output_section_ != NULL);
|
|
|
|
this->output_section_->add_input_section(spec, keep);
|
|
|
|
}
|
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
// This is called when we see DATA_SEGMENT_ALIGN. It means that any
|
|
|
|
// subsequent output sections may be relro.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::data_segment_align()
|
|
|
|
{
|
2009-03-19 06:51:49 +01:00
|
|
|
if (this->saw_data_segment_align_)
|
2008-08-13 09:37:46 +02:00
|
|
|
gold_error(_("DATA_SEGMENT_ALIGN may only appear once in a linker script"));
|
2009-03-19 06:51:49 +01:00
|
|
|
gold_assert(!this->sections_elements_->empty());
|
|
|
|
Sections_elements::iterator p = this->sections_elements_->end();
|
|
|
|
--p;
|
|
|
|
this->data_segment_align_start_ = p;
|
|
|
|
this->saw_data_segment_align_ = true;
|
2008-08-13 09:37:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// This is called when we see DATA_SEGMENT_RELRO_END. It means that
|
|
|
|
// any output sections seen since DATA_SEGMENT_ALIGN are relro.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::data_segment_relro_end()
|
|
|
|
{
|
|
|
|
if (this->saw_relro_end_)
|
|
|
|
gold_error(_("DATA_SEGMENT_RELRO_END may only appear once "
|
|
|
|
"in a linker script"));
|
|
|
|
this->saw_relro_end_ = true;
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
if (!this->saw_data_segment_align_)
|
2008-08-13 09:37:46 +02:00
|
|
|
gold_error(_("DATA_SEGMENT_RELRO_END must follow DATA_SEGMENT_ALIGN"));
|
|
|
|
else
|
|
|
|
{
|
2009-03-19 06:51:49 +01:00
|
|
|
Sections_elements::iterator p = this->data_segment_align_start_;
|
|
|
|
for (++p; p != this->sections_elements_->end(); ++p)
|
|
|
|
(*p)->set_is_relro();
|
2008-08-13 09:37:46 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
// Create any required sections.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::create_sections(Layout* layout)
|
|
|
|
{
|
|
|
|
if (!this->saw_sections_clause_)
|
|
|
|
return;
|
|
|
|
for (Sections_elements::iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
(*p)->create_sections(layout);
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Add any symbols we are defining to the symbol table.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_symbols_to_table(Symbol_table* symtab)
|
|
|
|
{
|
|
|
|
if (!this->saw_sections_clause_)
|
|
|
|
return;
|
|
|
|
for (Sections_elements::iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
(*p)->add_symbols_to_table(symtab);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finalize symbols and check assertions.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::finalize_symbols(Symbol_table* symtab, const Layout* layout)
|
|
|
|
{
|
|
|
|
if (!this->saw_sections_clause_)
|
|
|
|
return;
|
|
|
|
uint64_t dot_value = 0;
|
|
|
|
for (Sections_elements::iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
2008-02-09 02:22:17 +01:00
|
|
|
(*p)->finalize_symbols(symtab, layout, &dot_value);
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Return the name of the output section to use for an input file name
|
|
|
|
// and section name.
|
|
|
|
|
|
|
|
const char*
|
|
|
|
Script_sections::output_section_name(const char* file_name,
|
|
|
|
const char* section_name,
|
|
|
|
Output_section*** output_section_slot)
|
|
|
|
{
|
|
|
|
for (Sections_elements::const_iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
const char* ret = (*p)->output_section_name(file_name, section_name,
|
|
|
|
output_section_slot);
|
|
|
|
|
|
|
|
if (ret != NULL)
|
|
|
|
{
|
|
|
|
// The special name /DISCARD/ means that the input section
|
|
|
|
// should be discarded.
|
|
|
|
if (strcmp(ret, "/DISCARD/") == 0)
|
|
|
|
{
|
|
|
|
*output_section_slot = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we couldn't find a mapping for the name, the output section
|
|
|
|
// gets the name of the input section.
|
|
|
|
|
|
|
|
*output_section_slot = NULL;
|
|
|
|
|
|
|
|
return section_name;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Place a marker for an orphan output section into the SECTIONS
|
|
|
|
// clause.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::place_orphan(Output_section* os)
|
|
|
|
{
|
2009-03-19 06:51:49 +01:00
|
|
|
Orphan_section_placement* osp = this->orphan_section_placement_;
|
|
|
|
if (osp == NULL)
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
2009-03-19 06:51:49 +01:00
|
|
|
// Initialize the Orphan_section_placement structure.
|
|
|
|
osp = new Orphan_section_placement();
|
|
|
|
for (Sections_elements::iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
(*p)->orphan_section_init(osp, p);
|
|
|
|
gold_assert(!this->sections_elements_->empty());
|
|
|
|
Sections_elements::iterator last = this->sections_elements_->end();
|
|
|
|
--last;
|
|
|
|
osp->last_init(last);
|
|
|
|
this->orphan_section_placement_ = osp;
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
Orphan_output_section* orphan = new Orphan_output_section(os);
|
2008-08-13 09:37:46 +02:00
|
|
|
|
2009-03-19 06:51:49 +01:00
|
|
|
// Look for where to put ORPHAN.
|
|
|
|
Sections_elements::iterator* where;
|
|
|
|
if (osp->find_place(os, &where))
|
|
|
|
{
|
|
|
|
if ((**where)->is_relro())
|
|
|
|
os->set_is_relro();
|
|
|
|
else
|
|
|
|
os->clear_is_relro();
|
|
|
|
|
|
|
|
// We want to insert ORPHAN after *WHERE, and then update *WHERE
|
|
|
|
// so that the next one goes after this one.
|
|
|
|
Sections_elements::iterator p = *where;
|
|
|
|
gold_assert(p != this->sections_elements_->end());
|
|
|
|
++p;
|
|
|
|
*where = this->sections_elements_->insert(p, orphan);
|
|
|
|
}
|
2008-08-13 09:37:46 +02:00
|
|
|
else
|
2009-03-19 06:51:49 +01:00
|
|
|
{
|
|
|
|
os->clear_is_relro();
|
|
|
|
// We don't have a place to put this orphan section. Put it,
|
|
|
|
// and all other sections like it, at the end, but before the
|
|
|
|
// sections which always come at the end.
|
|
|
|
Sections_elements::iterator last = osp->last_place();
|
|
|
|
*where = this->sections_elements_->insert(last, orphan);
|
|
|
|
}
|
2008-02-04 06:43:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set the addresses of all the output sections. Walk through all the
|
|
|
|
// elements, tracking the dot symbol. Apply assignments which set
|
|
|
|
// absolute symbol values, in case they are used when setting dot.
|
|
|
|
// Fill in data statement values. As we find output sections, set the
|
|
|
|
// address, set the address of all associated input sections, and
|
|
|
|
// update dot. Return the segment which should hold the file header
|
|
|
|
// and segment headers, if any.
|
|
|
|
|
|
|
|
Output_segment*
|
|
|
|
Script_sections::set_section_addresses(Symbol_table* symtab, Layout* layout)
|
|
|
|
{
|
|
|
|
gold_assert(this->saw_sections_clause_);
|
|
|
|
|
2008-02-04 07:45:50 +01:00
|
|
|
// Implement ONLY_IF_RO/ONLY_IF_RW constraints. These are a pain
|
|
|
|
// for our representation.
|
|
|
|
for (Sections_elements::iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
Output_section_definition* posd;
|
|
|
|
Section_constraint failed_constraint = (*p)->check_constraint(&posd);
|
|
|
|
if (failed_constraint != CONSTRAINT_NONE)
|
|
|
|
{
|
|
|
|
Sections_elements::iterator q;
|
|
|
|
for (q = this->sections_elements_->begin();
|
|
|
|
q != this->sections_elements_->end();
|
|
|
|
++q)
|
|
|
|
{
|
|
|
|
if (q != p)
|
|
|
|
{
|
|
|
|
if ((*q)->alternate_constraint(posd, failed_constraint))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (q == this->sections_elements_->end())
|
|
|
|
gold_error(_("no matching section constraint"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-13 09:37:46 +02:00
|
|
|
// Force the alignment of the first TLS section to be the maximum
|
|
|
|
// alignment of all TLS sections.
|
|
|
|
Output_section* first_tls = NULL;
|
|
|
|
uint64_t tls_align = 0;
|
|
|
|
for (Sections_elements::const_iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
Output_section *os = (*p)->get_output_section();
|
|
|
|
if (os != NULL && (os->flags() & elfcpp::SHF_TLS) != 0)
|
|
|
|
{
|
|
|
|
if (first_tls == NULL)
|
|
|
|
first_tls = os;
|
|
|
|
if (os->addralign() > tls_align)
|
|
|
|
tls_align = os->addralign();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (first_tls != NULL)
|
|
|
|
first_tls->set_addralign(tls_align);
|
|
|
|
|
2008-02-09 02:22:17 +01:00
|
|
|
// For a relocatable link, we implicitly set dot to zero.
|
2008-02-04 06:43:05 +01:00
|
|
|
uint64_t dot_value = 0;
|
2008-02-14 03:34:22 +01:00
|
|
|
uint64_t load_address = 0;
|
2009-10-16 Doug Kwan <dougkwan@google.com>
* expression.cc (class Segment_start_expression): New class definition.
(Segment_start_expression::value): New method definition.
(script_exp_function_segment_start): Return a new
Segment_start_expression.
* gold/script-c.h (script_saw_segment_start_expression): New function
prototype.
* script-sections.cc (Script_sections::Script_sections): Initialize
SAW_SEGMENT_START_EXPRESSION_ to false.
(Script_sections::set_section_addresses): Use -Ttext, -Tdata
and -Tbbs options to specify section addresses if given in
command line and no SEGMENT_START expression is seen in a script.
* script-sections.h (Script_sections::saw_segment_start_expression,
Script_sections::set_saw_segment_start_expression): New method
definition.
(Script_sections::saw_segment_start_expression_): New data member
declaration.
* script.cc (script_saw_segment_start_expression): New function.
* yyscript.y (SEGMENT_START): Call script_saw_segment_start_expression.
* testsuite/Makefile.am (check_SCRIPTS): Add script_test_6.sh,
script_test_7.sh and script_test_8.sh.
(check_DATA): Add script_test_6.stdout, script_test_7.stdout and
script_test_8.stdout.
(MOSTLYCLEANFILES): Add script_test_6, script_test_7 and script_test_8.
(script_test_6, script_test_6.stdout, script_test_7,
script_test_7.stdout, script_test_8, script_test_8.stdout): New rules.
* Makefile.in: Regenerate.
* testsuite/script_test_6.sh: New file.
* testsuite/script_test_6.t: Same.
* testsuite/script_test_7.sh: Same.
* testsuite/script_test_7.t: Same.
* testsuite/script_test_8.sh: Same.
2009-10-16 20:56:07 +02:00
|
|
|
|
|
|
|
// Check to see if we want to use any of -Ttext, -Tdata and -Tbss options
|
|
|
|
// to set section addresses. If the script has any SEGMENT_START
|
|
|
|
// expression, we do not set the section addresses.
|
|
|
|
bool use_tsection_options =
|
|
|
|
(!this->saw_segment_start_expression_
|
|
|
|
&& (parameters->options().user_set_Ttext()
|
|
|
|
|| parameters->options().user_set_Tdata()
|
|
|
|
|| parameters->options().user_set_Tbss()));
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
for (Sections_elements::iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
2009-10-16 Doug Kwan <dougkwan@google.com>
* expression.cc (class Segment_start_expression): New class definition.
(Segment_start_expression::value): New method definition.
(script_exp_function_segment_start): Return a new
Segment_start_expression.
* gold/script-c.h (script_saw_segment_start_expression): New function
prototype.
* script-sections.cc (Script_sections::Script_sections): Initialize
SAW_SEGMENT_START_EXPRESSION_ to false.
(Script_sections::set_section_addresses): Use -Ttext, -Tdata
and -Tbbs options to specify section addresses if given in
command line and no SEGMENT_START expression is seen in a script.
* script-sections.h (Script_sections::saw_segment_start_expression,
Script_sections::set_saw_segment_start_expression): New method
definition.
(Script_sections::saw_segment_start_expression_): New data member
declaration.
* script.cc (script_saw_segment_start_expression): New function.
* yyscript.y (SEGMENT_START): Call script_saw_segment_start_expression.
* testsuite/Makefile.am (check_SCRIPTS): Add script_test_6.sh,
script_test_7.sh and script_test_8.sh.
(check_DATA): Add script_test_6.stdout, script_test_7.stdout and
script_test_8.stdout.
(MOSTLYCLEANFILES): Add script_test_6, script_test_7 and script_test_8.
(script_test_6, script_test_6.stdout, script_test_7,
script_test_7.stdout, script_test_8, script_test_8.stdout): New rules.
* Makefile.in: Regenerate.
* testsuite/script_test_6.sh: New file.
* testsuite/script_test_6.t: Same.
* testsuite/script_test_7.sh: Same.
* testsuite/script_test_7.t: Same.
* testsuite/script_test_8.sh: Same.
2009-10-16 20:56:07 +02:00
|
|
|
{
|
|
|
|
Output_section* os = (*p)->get_output_section();
|
|
|
|
|
|
|
|
// Handle -Ttext, -Tdata and -Tbss options. We do this by looking for
|
|
|
|
// the special sections by names and doing dot assignments.
|
|
|
|
if (use_tsection_options
|
|
|
|
&& os != NULL
|
|
|
|
&& (os->flags() & elfcpp::SHF_ALLOC) != 0)
|
|
|
|
{
|
|
|
|
uint64_t new_dot_value = dot_value;
|
|
|
|
|
|
|
|
if (parameters->options().user_set_Ttext()
|
|
|
|
&& strcmp(os->name(), ".text") == 0)
|
|
|
|
new_dot_value = parameters->options().Ttext();
|
|
|
|
else if (parameters->options().user_set_Tdata()
|
|
|
|
&& strcmp(os->name(), ".data") == 0)
|
|
|
|
new_dot_value = parameters->options().Tdata();
|
|
|
|
else if (parameters->options().user_set_Tbss()
|
|
|
|
&& strcmp(os->name(), ".bss") == 0)
|
|
|
|
new_dot_value = parameters->options().Tbss();
|
|
|
|
|
|
|
|
// Update dot and load address if necessary.
|
|
|
|
if (new_dot_value < dot_value)
|
|
|
|
gold_error(_("dot may not move backward"));
|
|
|
|
else if (new_dot_value != dot_value)
|
|
|
|
{
|
|
|
|
dot_value = new_dot_value;
|
|
|
|
load_address = new_dot_value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
(*p)->set_section_addresses(symtab, layout, &dot_value, &load_address);
|
|
|
|
}
|
2008-02-04 06:43:05 +01:00
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
if (this->phdrs_elements_ != NULL)
|
|
|
|
{
|
|
|
|
for (Phdrs_elements::iterator p = this->phdrs_elements_->begin();
|
|
|
|
p != this->phdrs_elements_->end();
|
|
|
|
++p)
|
|
|
|
(*p)->eval_load_address(symtab, layout);
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
return this->create_segments(layout);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sort the sections in order to put them into segments.
|
|
|
|
|
|
|
|
class Sort_output_sections
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
bool
|
|
|
|
operator()(const Output_section* os1, const Output_section* os2) const;
|
|
|
|
};
|
|
|
|
|
|
|
|
bool
|
|
|
|
Sort_output_sections::operator()(const Output_section* os1,
|
|
|
|
const Output_section* os2) const
|
|
|
|
{
|
|
|
|
// Sort first by the load address.
|
|
|
|
uint64_t lma1 = (os1->has_load_address()
|
|
|
|
? os1->load_address()
|
|
|
|
: os1->address());
|
|
|
|
uint64_t lma2 = (os2->has_load_address()
|
|
|
|
? os2->load_address()
|
|
|
|
: os2->address());
|
|
|
|
if (lma1 != lma2)
|
|
|
|
return lma1 < lma2;
|
|
|
|
|
|
|
|
// Then sort by the virtual address.
|
|
|
|
if (os1->address() != os2->address())
|
|
|
|
return os1->address() < os2->address();
|
|
|
|
|
|
|
|
// Sort TLS sections to the end.
|
|
|
|
bool tls1 = (os1->flags() & elfcpp::SHF_TLS) != 0;
|
|
|
|
bool tls2 = (os2->flags() & elfcpp::SHF_TLS) != 0;
|
|
|
|
if (tls1 != tls2)
|
|
|
|
return tls2;
|
|
|
|
|
|
|
|
// Sort PROGBITS before NOBITS.
|
|
|
|
if (os1->type() == elfcpp::SHT_PROGBITS && os2->type() == elfcpp::SHT_NOBITS)
|
|
|
|
return true;
|
|
|
|
if (os1->type() == elfcpp::SHT_NOBITS && os2->type() == elfcpp::SHT_PROGBITS)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Otherwise we don't care.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return whether OS is a BSS section. This is a SHT_NOBITS section.
|
|
|
|
// We treat a section with the SHF_TLS flag set as taking up space
|
|
|
|
// even if it is SHT_NOBITS (this is true of .tbss), as we allocate
|
|
|
|
// space for them in the file.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Script_sections::is_bss_section(const Output_section* os)
|
|
|
|
{
|
|
|
|
return (os->type() == elfcpp::SHT_NOBITS
|
|
|
|
&& (os->flags() & elfcpp::SHF_TLS) == 0);
|
|
|
|
}
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Return the size taken by the file header and the program headers.
|
|
|
|
|
|
|
|
size_t
|
|
|
|
Script_sections::total_header_size(Layout* layout) const
|
|
|
|
{
|
|
|
|
size_t segment_count = layout->segment_count();
|
|
|
|
size_t file_header_size;
|
|
|
|
size_t segment_headers_size;
|
2008-02-28 01:18:24 +01:00
|
|
|
if (parameters->target().get_size() == 32)
|
2008-02-04 23:54:31 +01:00
|
|
|
{
|
|
|
|
file_header_size = elfcpp::Elf_sizes<32>::ehdr_size;
|
|
|
|
segment_headers_size = segment_count * elfcpp::Elf_sizes<32>::phdr_size;
|
|
|
|
}
|
2008-02-28 01:18:24 +01:00
|
|
|
else if (parameters->target().get_size() == 64)
|
2008-02-04 23:54:31 +01:00
|
|
|
{
|
|
|
|
file_header_size = elfcpp::Elf_sizes<64>::ehdr_size;
|
|
|
|
segment_headers_size = segment_count * elfcpp::Elf_sizes<64>::phdr_size;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
gold_unreachable();
|
|
|
|
|
|
|
|
return file_header_size + segment_headers_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the amount we have to subtract from the LMA to accomodate
|
|
|
|
// headers of the given size. The complication is that the file
|
|
|
|
// header have to be at the start of a page, as otherwise it will not
|
|
|
|
// be at the start of the file.
|
|
|
|
|
|
|
|
uint64_t
|
|
|
|
Script_sections::header_size_adjustment(uint64_t lma,
|
|
|
|
size_t sizeof_headers) const
|
|
|
|
{
|
2008-02-28 01:18:24 +01:00
|
|
|
const uint64_t abi_pagesize = parameters->target().abi_pagesize();
|
2008-02-04 23:54:31 +01:00
|
|
|
uint64_t hdr_lma = lma - sizeof_headers;
|
|
|
|
hdr_lma &= ~(abi_pagesize - 1);
|
|
|
|
return lma - hdr_lma;
|
|
|
|
}
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
// Create the PT_LOAD segments when using a SECTIONS clause. Returns
|
|
|
|
// the segment which should hold the file header and segment headers,
|
|
|
|
// if any.
|
|
|
|
|
|
|
|
Output_segment*
|
|
|
|
Script_sections::create_segments(Layout* layout)
|
|
|
|
{
|
|
|
|
gold_assert(this->saw_sections_clause_);
|
|
|
|
|
2008-02-28 01:18:24 +01:00
|
|
|
if (parameters->options().relocatable())
|
2008-02-04 06:43:05 +01:00
|
|
|
return NULL;
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
if (this->saw_phdrs_clause())
|
|
|
|
return create_segments_from_phdrs_clause(layout);
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
Layout::Section_list sections;
|
|
|
|
layout->get_allocated_sections(§ions);
|
|
|
|
|
|
|
|
// Sort the sections by address.
|
|
|
|
std::stable_sort(sections.begin(), sections.end(), Sort_output_sections());
|
|
|
|
|
|
|
|
this->create_note_and_tls_segments(layout, §ions);
|
|
|
|
|
|
|
|
// Walk through the sections adding them to PT_LOAD segments.
|
2008-02-28 01:18:24 +01:00
|
|
|
const uint64_t abi_pagesize = parameters->target().abi_pagesize();
|
2008-02-04 06:43:05 +01:00
|
|
|
Output_segment* first_seg = NULL;
|
|
|
|
Output_segment* current_seg = NULL;
|
|
|
|
bool is_current_seg_readonly = true;
|
|
|
|
Layout::Section_list::iterator plast = sections.end();
|
|
|
|
uint64_t last_vma = 0;
|
|
|
|
uint64_t last_lma = 0;
|
|
|
|
uint64_t last_size = 0;
|
|
|
|
for (Layout::Section_list::iterator p = sections.begin();
|
|
|
|
p != sections.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
const uint64_t vma = (*p)->address();
|
|
|
|
const uint64_t lma = ((*p)->has_load_address()
|
|
|
|
? (*p)->load_address()
|
|
|
|
: vma);
|
|
|
|
const uint64_t size = (*p)->current_data_size();
|
|
|
|
|
|
|
|
bool need_new_segment;
|
|
|
|
if (current_seg == NULL)
|
|
|
|
need_new_segment = true;
|
|
|
|
else if (lma - vma != last_lma - last_vma)
|
|
|
|
{
|
|
|
|
// This section has a different LMA relationship than the
|
|
|
|
// last one; we need a new segment.
|
|
|
|
need_new_segment = true;
|
|
|
|
}
|
|
|
|
else if (align_address(last_lma + last_size, abi_pagesize)
|
|
|
|
< align_address(lma, abi_pagesize))
|
|
|
|
{
|
|
|
|
// Putting this section in the segment would require
|
|
|
|
// skipping a page.
|
|
|
|
need_new_segment = true;
|
|
|
|
}
|
|
|
|
else if (is_bss_section(*plast) && !is_bss_section(*p))
|
|
|
|
{
|
|
|
|
// A non-BSS section can not follow a BSS section in the
|
|
|
|
// same segment.
|
|
|
|
need_new_segment = true;
|
|
|
|
}
|
|
|
|
else if (is_current_seg_readonly
|
2008-07-23 01:01:20 +02:00
|
|
|
&& ((*p)->flags() & elfcpp::SHF_WRITE) != 0
|
|
|
|
&& !parameters->options().omagic())
|
2008-02-04 06:43:05 +01:00
|
|
|
{
|
|
|
|
// Don't put a writable section in the same segment as a
|
|
|
|
// non-writable section.
|
|
|
|
need_new_segment = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Otherwise, reuse the existing segment.
|
|
|
|
need_new_segment = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
elfcpp::Elf_Word seg_flags =
|
|
|
|
Layout::section_flags_to_segment((*p)->flags());
|
|
|
|
|
|
|
|
if (need_new_segment)
|
|
|
|
{
|
|
|
|
current_seg = layout->make_output_segment(elfcpp::PT_LOAD,
|
|
|
|
seg_flags);
|
|
|
|
current_seg->set_addresses(vma, lma);
|
|
|
|
if (first_seg == NULL)
|
|
|
|
first_seg = current_seg;
|
|
|
|
is_current_seg_readonly = true;
|
|
|
|
}
|
|
|
|
|
2009-11-04 16:56:03 +01:00
|
|
|
current_seg->add_output_section(*p, seg_flags, false);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
if (((*p)->flags() & elfcpp::SHF_WRITE) != 0)
|
|
|
|
is_current_seg_readonly = false;
|
|
|
|
|
|
|
|
plast = p;
|
|
|
|
last_vma = vma;
|
|
|
|
last_lma = lma;
|
|
|
|
last_size = size;
|
|
|
|
}
|
|
|
|
|
|
|
|
// An ELF program should work even if the program headers are not in
|
|
|
|
// a PT_LOAD segment. However, it appears that the Linux kernel
|
|
|
|
// does not set the AT_PHDR auxiliary entry in that case. It sets
|
|
|
|
// the load address to p_vaddr - p_offset of the first PT_LOAD
|
|
|
|
// segment. It then sets AT_PHDR to the load address plus the
|
|
|
|
// offset to the program headers, e_phoff in the file header. This
|
|
|
|
// fails when the program headers appear in the file before the
|
|
|
|
// first PT_LOAD segment. Therefore, we always create a PT_LOAD
|
|
|
|
// segment to hold the file header and the program headers. This is
|
|
|
|
// effectively what the GNU linker does, and it is slightly more
|
|
|
|
// efficient in any case. We try to use the first PT_LOAD segment
|
|
|
|
// if we can, otherwise we make a new one.
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
if (first_seg == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2009-06-23 08:07:50 +02:00
|
|
|
// -n or -N mean that the program is not demand paged and there is
|
|
|
|
// no need to put the program headers in a PT_LOAD segment.
|
|
|
|
if (parameters->options().nmagic() || parameters->options().omagic())
|
|
|
|
return NULL;
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
size_t sizeof_headers = this->total_header_size(layout);
|
2008-02-04 07:45:50 +01:00
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
uint64_t vma = first_seg->vaddr();
|
|
|
|
uint64_t lma = first_seg->paddr();
|
|
|
|
|
|
|
|
uint64_t subtract = this->header_size_adjustment(lma, sizeof_headers);
|
|
|
|
|
2008-04-16 00:50:37 +02:00
|
|
|
if ((lma & (abi_pagesize - 1)) >= sizeof_headers)
|
|
|
|
{
|
|
|
|
first_seg->set_addresses(vma - subtract, lma - subtract);
|
|
|
|
return first_seg;
|
|
|
|
}
|
|
|
|
|
2008-02-28 05:45:47 +01:00
|
|
|
// If there is no room to squeeze in the headers, then punt. The
|
|
|
|
// resulting executable probably won't run on GNU/Linux, but we
|
|
|
|
// trust that the user knows what they are doing.
|
|
|
|
if (lma < subtract || vma < subtract)
|
|
|
|
return NULL;
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
Output_segment* load_seg = layout->make_output_segment(elfcpp::PT_LOAD,
|
|
|
|
elfcpp::PF_R);
|
2008-02-28 05:45:47 +01:00
|
|
|
load_seg->set_addresses(vma - subtract, lma - subtract);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
return load_seg;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a PT_NOTE segment for each SHT_NOTE section and a PT_TLS
|
|
|
|
// segment if there are any SHT_TLS sections.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::create_note_and_tls_segments(
|
|
|
|
Layout* layout,
|
|
|
|
const Layout::Section_list* sections)
|
|
|
|
{
|
2008-02-04 23:54:31 +01:00
|
|
|
gold_assert(!this->saw_phdrs_clause());
|
|
|
|
|
2008-02-04 06:43:05 +01:00
|
|
|
bool saw_tls = false;
|
|
|
|
for (Layout::Section_list::const_iterator p = sections->begin();
|
|
|
|
p != sections->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if ((*p)->type() == elfcpp::SHT_NOTE)
|
|
|
|
{
|
|
|
|
elfcpp::Elf_Word seg_flags =
|
|
|
|
Layout::section_flags_to_segment((*p)->flags());
|
|
|
|
Output_segment* oseg = layout->make_output_segment(elfcpp::PT_NOTE,
|
|
|
|
seg_flags);
|
2009-11-04 16:56:03 +01:00
|
|
|
oseg->add_output_section(*p, seg_flags, false);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
// Incorporate any subsequent SHT_NOTE sections, in the
|
|
|
|
// hopes that the script is sensible.
|
|
|
|
Layout::Section_list::const_iterator pnext = p + 1;
|
|
|
|
while (pnext != sections->end()
|
|
|
|
&& (*pnext)->type() == elfcpp::SHT_NOTE)
|
|
|
|
{
|
|
|
|
seg_flags = Layout::section_flags_to_segment((*pnext)->flags());
|
2009-11-04 16:56:03 +01:00
|
|
|
oseg->add_output_section(*pnext, seg_flags, false);
|
2008-02-04 06:43:05 +01:00
|
|
|
p = pnext;
|
|
|
|
++pnext;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (((*p)->flags() & elfcpp::SHF_TLS) != 0)
|
|
|
|
{
|
|
|
|
if (saw_tls)
|
|
|
|
gold_error(_("TLS sections are not adjacent"));
|
|
|
|
|
|
|
|
elfcpp::Elf_Word seg_flags =
|
|
|
|
Layout::section_flags_to_segment((*p)->flags());
|
|
|
|
Output_segment* oseg = layout->make_output_segment(elfcpp::PT_TLS,
|
|
|
|
seg_flags);
|
2009-11-04 16:56:03 +01:00
|
|
|
oseg->add_output_section(*p, seg_flags, false);
|
2008-02-04 06:43:05 +01:00
|
|
|
|
|
|
|
Layout::Section_list::const_iterator pnext = p + 1;
|
|
|
|
while (pnext != sections->end()
|
|
|
|
&& ((*pnext)->flags() & elfcpp::SHF_TLS) != 0)
|
|
|
|
{
|
|
|
|
seg_flags = Layout::section_flags_to_segment((*pnext)->flags());
|
2009-11-04 16:56:03 +01:00
|
|
|
oseg->add_output_section(*pnext, seg_flags, false);
|
2008-02-04 06:43:05 +01:00
|
|
|
p = pnext;
|
|
|
|
++pnext;
|
|
|
|
}
|
|
|
|
|
|
|
|
saw_tls = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Add a program header. The PHDRS clause is syntactically distinct
|
|
|
|
// from the SECTIONS clause, but we implement it with the SECTIONS
|
2009-06-24 21:00:15 +02:00
|
|
|
// support because PHDRS is useless if there is no SECTIONS clause.
|
2008-02-04 23:54:31 +01:00
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::add_phdr(const char* name, size_t namelen, unsigned int type,
|
|
|
|
bool includes_filehdr, bool includes_phdrs,
|
|
|
|
bool is_flags_valid, unsigned int flags,
|
|
|
|
Expression* load_address)
|
|
|
|
{
|
|
|
|
if (this->phdrs_elements_ == NULL)
|
|
|
|
this->phdrs_elements_ = new Phdrs_elements();
|
|
|
|
this->phdrs_elements_->push_back(new Phdrs_element(name, namelen, type,
|
|
|
|
includes_filehdr,
|
|
|
|
includes_phdrs,
|
|
|
|
is_flags_valid, flags,
|
|
|
|
load_address));
|
|
|
|
}
|
|
|
|
|
2008-02-04 07:45:50 +01:00
|
|
|
// Return the number of segments we expect to create based on the
|
|
|
|
// SECTIONS clause. This is used to implement SIZEOF_HEADERS.
|
|
|
|
|
|
|
|
size_t
|
|
|
|
Script_sections::expected_segment_count(const Layout* layout) const
|
|
|
|
{
|
2008-02-04 23:54:31 +01:00
|
|
|
if (this->saw_phdrs_clause())
|
|
|
|
return this->phdrs_elements_->size();
|
|
|
|
|
2008-02-04 07:45:50 +01:00
|
|
|
Layout::Section_list sections;
|
|
|
|
layout->get_allocated_sections(§ions);
|
|
|
|
|
|
|
|
// We assume that we will need two PT_LOAD segments.
|
|
|
|
size_t ret = 2;
|
|
|
|
|
|
|
|
bool saw_note = false;
|
|
|
|
bool saw_tls = false;
|
|
|
|
for (Layout::Section_list::const_iterator p = sections.begin();
|
|
|
|
p != sections.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if ((*p)->type() == elfcpp::SHT_NOTE)
|
|
|
|
{
|
|
|
|
// Assume that all note sections will fit into a single
|
|
|
|
// PT_NOTE segment.
|
|
|
|
if (!saw_note)
|
|
|
|
{
|
|
|
|
++ret;
|
|
|
|
saw_note = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (((*p)->flags() & elfcpp::SHF_TLS) != 0)
|
|
|
|
{
|
|
|
|
// There can only be one PT_TLS segment.
|
|
|
|
if (!saw_tls)
|
|
|
|
{
|
|
|
|
++ret;
|
|
|
|
saw_tls = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
// Create the segments from a PHDRS clause. Return the segment which
|
|
|
|
// should hold the file header and program headers, if any.
|
|
|
|
|
|
|
|
Output_segment*
|
|
|
|
Script_sections::create_segments_from_phdrs_clause(Layout* layout)
|
|
|
|
{
|
|
|
|
this->attach_sections_using_phdrs_clause(layout);
|
|
|
|
return this->set_phdrs_clause_addresses(layout);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create the segments from the PHDRS clause, and put the output
|
|
|
|
// sections in them.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::attach_sections_using_phdrs_clause(Layout* layout)
|
|
|
|
{
|
|
|
|
typedef std::map<std::string, Output_segment*> Name_to_segment;
|
|
|
|
Name_to_segment name_to_segment;
|
|
|
|
for (Phdrs_elements::const_iterator p = this->phdrs_elements_->begin();
|
|
|
|
p != this->phdrs_elements_->end();
|
|
|
|
++p)
|
|
|
|
name_to_segment[(*p)->name()] = (*p)->create_segment(layout);
|
|
|
|
|
|
|
|
// Walk through the output sections and attach them to segments.
|
|
|
|
// Output sections in the script which do not list segments are
|
|
|
|
// attached to the same set of segments as the immediately preceding
|
|
|
|
// output section.
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
String_list* phdr_names = NULL;
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
bool load_segments_only = false;
|
2008-02-04 23:54:31 +01:00
|
|
|
for (Sections_elements::const_iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
{
|
2008-04-10 03:02:46 +02:00
|
|
|
bool orphan;
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
String_list* old_phdr_names = phdr_names;
|
2008-04-10 03:02:46 +02:00
|
|
|
Output_section* os = (*p)->allocate_to_segment(&phdr_names, &orphan);
|
2008-02-04 23:54:31 +01:00
|
|
|
if (os == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (phdr_names == NULL)
|
|
|
|
{
|
|
|
|
gold_error(_("allocated section not in any segment"));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
// We see a list of segments names. Disable PT_LOAD segment only
|
|
|
|
// filtering.
|
|
|
|
if (old_phdr_names != phdr_names)
|
|
|
|
load_segments_only = false;
|
|
|
|
|
2008-04-10 03:02:46 +02:00
|
|
|
// If this is an orphan section--one that was not explicitly
|
|
|
|
// mentioned in the linker script--then it should not inherit
|
|
|
|
// any segment type other than PT_LOAD. Otherwise, e.g., the
|
|
|
|
// PT_INTERP segment will pick up following orphan sections,
|
|
|
|
// which does not make sense. If this is not an orphan section,
|
|
|
|
// we trust the linker script.
|
|
|
|
if (orphan)
|
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
// Enable PT_LOAD segments only filtering until we see another
|
|
|
|
// list of segment names.
|
|
|
|
load_segments_only = true;
|
2008-04-10 03:02:46 +02:00
|
|
|
}
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
bool in_load_segment = false;
|
|
|
|
for (String_list::const_iterator q = phdr_names->begin();
|
|
|
|
q != phdr_names->end();
|
|
|
|
++q)
|
|
|
|
{
|
|
|
|
Name_to_segment::const_iterator r = name_to_segment.find(*q);
|
|
|
|
if (r == name_to_segment.end())
|
|
|
|
gold_error(_("no segment %s"), q->c_str());
|
|
|
|
else
|
|
|
|
{
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
if (load_segments_only
|
|
|
|
&& r->second->type() != elfcpp::PT_LOAD)
|
|
|
|
continue;
|
|
|
|
|
2008-02-04 23:54:31 +01:00
|
|
|
elfcpp::Elf_Word seg_flags =
|
|
|
|
Layout::section_flags_to_segment(os->flags());
|
2009-11-04 16:56:03 +01:00
|
|
|
r->second->add_output_section(os, seg_flags, false);
|
2008-02-04 23:54:31 +01:00
|
|
|
|
|
|
|
if (r->second->type() == elfcpp::PT_LOAD)
|
|
|
|
{
|
|
|
|
if (in_load_segment)
|
|
|
|
gold_error(_("section in two PT_LOAD segments"));
|
|
|
|
in_load_segment = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!in_load_segment)
|
|
|
|
gold_error(_("allocated section not in any PT_LOAD segment"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the addresses for segments created from a PHDRS clause. Return
|
|
|
|
// the segment which should hold the file header and program headers,
|
|
|
|
// if any.
|
|
|
|
|
|
|
|
Output_segment*
|
|
|
|
Script_sections::set_phdrs_clause_addresses(Layout* layout)
|
|
|
|
{
|
|
|
|
Output_segment* load_seg = NULL;
|
|
|
|
for (Phdrs_elements::const_iterator p = this->phdrs_elements_->begin();
|
|
|
|
p != this->phdrs_elements_->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
// Note that we have to set the flags after adding the output
|
|
|
|
// sections to the segment, as adding an output segment can
|
|
|
|
// change the flags.
|
|
|
|
(*p)->set_flags_if_valid();
|
|
|
|
|
|
|
|
Output_segment* oseg = (*p)->segment();
|
|
|
|
|
|
|
|
if (oseg->type() != elfcpp::PT_LOAD)
|
|
|
|
{
|
|
|
|
// The addresses of non-PT_LOAD segments are set from the
|
|
|
|
// PT_LOAD segments.
|
|
|
|
if ((*p)->has_load_address())
|
|
|
|
gold_error(_("may only specify load address for PT_LOAD segment"));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// The output sections should have addresses from the SECTIONS
|
|
|
|
// clause. The addresses don't have to be in order, so find the
|
|
|
|
// one with the lowest load address. Use that to set the
|
|
|
|
// address of the segment.
|
|
|
|
|
|
|
|
Output_section* osec = oseg->section_with_lowest_load_address();
|
|
|
|
if (osec == NULL)
|
|
|
|
{
|
|
|
|
oseg->set_addresses(0, 0);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t vma = osec->address();
|
|
|
|
uint64_t lma = osec->has_load_address() ? osec->load_address() : vma;
|
|
|
|
|
|
|
|
// Override the load address of the section with the load
|
|
|
|
// address specified for the segment.
|
|
|
|
if ((*p)->has_load_address())
|
|
|
|
{
|
|
|
|
if (osec->has_load_address())
|
|
|
|
gold_warning(_("PHDRS load address overrides "
|
|
|
|
"section %s load address"),
|
|
|
|
osec->name());
|
|
|
|
|
|
|
|
lma = (*p)->load_address();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool headers = (*p)->includes_filehdr() && (*p)->includes_phdrs();
|
|
|
|
if (!headers && ((*p)->includes_filehdr() || (*p)->includes_phdrs()))
|
|
|
|
{
|
|
|
|
// We could support this if we wanted to.
|
|
|
|
gold_error(_("using only one of FILEHDR and PHDRS is "
|
|
|
|
"not currently supported"));
|
|
|
|
}
|
|
|
|
if (headers)
|
|
|
|
{
|
|
|
|
size_t sizeof_headers = this->total_header_size(layout);
|
|
|
|
uint64_t subtract = this->header_size_adjustment(lma,
|
|
|
|
sizeof_headers);
|
|
|
|
if (lma >= subtract && vma >= subtract)
|
|
|
|
{
|
|
|
|
lma -= subtract;
|
|
|
|
vma -= subtract;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_error(_("sections loaded on first page without room "
|
|
|
|
"for file and program headers "
|
|
|
|
"are not supported"));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (load_seg != NULL)
|
|
|
|
gold_error(_("using FILEHDR and PHDRS on more than one "
|
|
|
|
"PT_LOAD segment is not currently supported"));
|
|
|
|
load_seg = oseg;
|
|
|
|
}
|
|
|
|
|
|
|
|
oseg->set_addresses(vma, lma);
|
|
|
|
}
|
|
|
|
|
|
|
|
return load_seg;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add the file header and segment headers to non-load segments
|
|
|
|
// specified in the PHDRS clause.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::put_headers_in_phdrs(Output_data* file_header,
|
|
|
|
Output_data* segment_headers)
|
|
|
|
{
|
|
|
|
gold_assert(this->saw_phdrs_clause());
|
|
|
|
for (Phdrs_elements::iterator p = this->phdrs_elements_->begin();
|
|
|
|
p != this->phdrs_elements_->end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
if ((*p)->type() != elfcpp::PT_LOAD)
|
|
|
|
{
|
|
|
|
if ((*p)->includes_phdrs())
|
|
|
|
(*p)->segment()->add_initial_output_data(segment_headers);
|
|
|
|
if ((*p)->includes_filehdr())
|
|
|
|
(*p)->segment()->add_initial_output_data(file_header);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-29 01:04:06 +01:00
|
|
|
// Look for an output section by name and return the address, the load
|
|
|
|
// address, the alignment, and the size. This is used when an
|
|
|
|
// expression refers to an output section which was not actually
|
|
|
|
// created. This returns true if the section was found, false
|
|
|
|
// otherwise.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Script_sections::get_output_section_info(const char* name, uint64_t* address,
|
|
|
|
uint64_t* load_address,
|
|
|
|
uint64_t* addralign,
|
|
|
|
uint64_t* size) const
|
|
|
|
{
|
|
|
|
if (!this->saw_sections_clause_)
|
|
|
|
return false;
|
|
|
|
for (Sections_elements::const_iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
if ((*p)->get_output_section_info(name, address, load_address, addralign,
|
|
|
|
size))
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2009-09-17 Doug Kwan <dougkwan@google.com>
* debug.h (DEBUG_RELAXATION): New constant.
(DEBUG_ALL): Add DEBUG_RELAXATION.
(debug_string_to_enum): Add relaxation debug option.
* layout.cc
(Layout::Relaxation_debug_check::check_output_data_for_reset_values,
Layout::Relaxation_debug_check::read_sections,
Layout::Relaxation_debug_check::read_sections): New method definitions.
(Layout::Layout): Initialize data members
record_output_section_data_from_scrips_,
script_output_section_data_list_ and relaxation_debug_check_.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method definitions.
(Layout::finalize): Support relaxation. Move section layout code to
Layout::relaxation_loop_body.
(Layout::set_asection_address_from_script): Move code for orphan
section placement out.
(Layout::place_orphan_sections_in_script): New method definition.
* layout.h (Output_segment_headers, Output_file_header):
New forward class declarations.
(Layout::~Layout): Define.
(Layout::new_output_section_data_from_script): New method definition.
(Layout::place_orphan_sections_in_script): New method declaration.
(Layout::Segment_states): New type declaration.
(Layout::save_segments, Layout::restore_segments,
Layout::clean_up_after_relaxation, Layout::prepare_for_relaxation,
Layout::relaxation_loop_body): New method declarations.
(Layout::Output_section_data_list): New type declaration.
(Layout::Relaxation_debug_check): New class definition.
(Layout::record_output_section_data_from_script_,
Layout::script_output_section_data_list_, Layout::segment_states_,
Layout::relaxation_debug_check_): New data members.
* output.cc: (Output_section_headers::do_size): New method definition.
(Output_section_headers::Output_section_headers): Move size
computation to Output_section_headers::do_size.
(Output_segment_headers::do_size): New method definition.
(Output_file_header::Output_file_header): Move size computation to
Output_file_header::do_size and call it.
(Output_file_header::do_size): New method definition.
(Output_data_group::Output_data_group): Adjust call to
Output_section_data.
(Output_data_dynamic::set_final_data_size): Add DT_NULL tag only once.
(Output_symtab_xindex::do_write): Add array bound check.
(Output_section::Input_section::print_to_mapfile): Handle
RELAXED_INPUT_SECTION_CODE.
(Output_section::Output_section): Initialize data member checkpoint_.
(Output_section::~Output_section): Delete checkpoint object pointed
by checkpoint_.
(Output_section::add_input_section): Always add an Input_section if
relaxing.
(Output_section::add_merge_input_section): Add assert.
(Output_section::relax_input_section): New method definition.
(Output_section::set_final_data_size): Set load address to zero for
an unallocated section.
(Output_section::do_address_and_file_offset_have_reset_values):
New method definition.
(Output_section::Input_section_sort_enty::Input_section_sort_enty):
Handle relaxed input section.
(Output_section::sort_attached_input_sections): Checkpoint input
section list lazily.
(Output_section::get_input_sections): Change type of input_sections to
list of Simple_input_section pointers. Checkpoint input section list
lazily. Also handle relaxed input sections.
(Output_section::add_input_section_for_script): Take a reference to
a Simple_input_section object instead of Relobj pointer and section
index as parameter. Handle relaxed input sections.
(Output_section::save_states, Output_section::restore_states): New
method definitions.
* output.h (Output_data::Output_data): Initialize is_data_size_fixed_.
(Output_data::is_data_size_fixed): New method definition.
(Output_data::reset_addresss_and_file_offset): Do not reset data size
if it is fixed.
(Output_data::address_and_file_offset_have_reset_values): New method
definition.
(Output_data::do_address_and_file_offset_have_reset_values): New method
definition.
(Output_data::set_data_size): Check that data size is not fixed.
(Output_data::fix_data_size): New method definition.
(Output_data::is_data_size_fixed_): New data member.
(Output_section_headers::set_final_data_size): New method definition.
(Output_section_headers::do_size): New method declaration.
(Output_segment_headers::set_final_data_size): New method definition.
(Output_segment_headers::do_size): New method declaration.
(Output_file_header::set_final_data_size)::New method definition.
(Output_file_header::do_size)::New method declaration.
(Output_section_data::Output_section_data): Add new parameter
is_data_size_fixed and use it to fix data size.
(Output_data_const::Output_data_const): Adjust call to base class
constructor and fix data size.
(Output_data_const_buffer::Output_data_const_buffer): Adjust call to
base class constructor and fix data size.
(Output_data_fixed_space::Output_data_fixed_space): Adjust call to
base class constructor and fix data size.
(Output_data_zero_fill::Output_data_zero_fill): Adjust call to base
class constructor and fix data size.
(Output_data_group::set_final_data_size): New method definition.
(Output_data_dynamic::Dynamic_entry::tag): New method definition.
(Output_symtab_xindex::Output_symtab_xindex): Adjust call to base
class constructor and fix data size.
(Output_relaxed_input_section): New class definition.
(Output_section::Simple_input_section): New class definition.
(Output_section::get_input_sections): Adjust parameter list.
(Output_section::add_input_section_for_script): Same.
(Output_section::save_states, Output_section::restore_states,
Output_section::do_address_and_file_offset_have_reset_values,
(Output_section::Input_section::Input_section): Handle
RELAXED_INPUT_SECTION_CODE. Add new overload for
Output_relaxed_input_section.
(Output_section::Input_section::is_input_section,
Output_section::Input_section::set_output_section): Handle relaxed
input section.
(Output_section::Input_section::is_relaxed_input_section,
Output_section::Input_section::output_section_data,
Output_section::Input_section::relaxed_input_section): New method
definitions.
(Output_section::Input_section::RELAXED_INPUT_SECTION_CODE): New enum
value.
(Output_section::Input_section::u1_): Update comments.
(Output_section::Input_section::u2_): Add new union member poris.
(Output_section::Checkpoint_output_section): New classs definition.
(Output_section::relax_input_section): New method declaration.
(Output_section::checkpoint_): New data member.
(Output_segment): Update comments.
(Output_segment::Output_segment): Un-privatize copy constructor.
(Output_segment::operator=): Un-privatize.
* script-sections.cc (Output_section_element::Input_section_list):
Change element type to Output_section::Simple_input_section.
(Output_section_element_dot_assignment::set_section_addresses):
Register output section data for relaxation clean up.
(Output_data_exression::Output_data_expression): Adjust call to base
constructor to fix data size.
(Output_section_element_data::set_section_addresses): Register
Output_data_expression object for relaxation clean up.
(struct Input_section_info): Replace Relobj pointer and section index
pair with Output_section::Simple_input_section and Convert struct to a
class.
(Input_section_sorter::operator()): Adjust access to
Input_section_info data member to use accessors.
(Output_section_element_input::set_section_addresses): Use layout
parameter. Adjust code to use Output_section::Simple_input_section
and Input_secction_info classes. Register filler for relaxation
clean up.
(Orphan_output_section::set_section_addresses): Replace Relobj pointer
and section index pair with Output_section::Simple_input_section
class. Adjust code accordingly.
(Phdrs_element::release_segment): New method definition.
(Script_sections::attach_sections_using_phdrs_clause): Do not modify
segment list.
(Script_sections::release_segments): New method definition.
* gold/script-sections.h (Script_sections::release_segments): New
method declaration.
* gold/target.h (Target::may_relax, Target::relax,
Target::do_may_relax, Target::do_relax): New method definitions.
2009-09-18 03:10:38 +02:00
|
|
|
// Release all Output_segments. This remove all pointers to all
|
|
|
|
// Output_segments.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::release_segments()
|
|
|
|
{
|
|
|
|
if (this->saw_phdrs_clause())
|
|
|
|
{
|
|
|
|
for (Phdrs_elements::const_iterator p = this->phdrs_elements_->begin();
|
|
|
|
p != this->phdrs_elements_->end();
|
|
|
|
++p)
|
|
|
|
(*p)->release_segment();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-23 02:31:13 +01:00
|
|
|
// Print the SECTIONS clause to F for debugging.
|
|
|
|
|
|
|
|
void
|
|
|
|
Script_sections::print(FILE* f) const
|
|
|
|
{
|
|
|
|
if (!this->saw_sections_clause_)
|
|
|
|
return;
|
|
|
|
|
|
|
|
fprintf(f, "SECTIONS {\n");
|
|
|
|
|
|
|
|
for (Sections_elements::const_iterator p = this->sections_elements_->begin();
|
|
|
|
p != this->sections_elements_->end();
|
|
|
|
++p)
|
|
|
|
(*p)->print(f);
|
|
|
|
|
|
|
|
fprintf(f, "}\n");
|
2008-02-05 00:53:15 +01:00
|
|
|
|
|
|
|
if (this->phdrs_elements_ != NULL)
|
|
|
|
{
|
|
|
|
fprintf(f, "PHDRS {\n");
|
|
|
|
for (Phdrs_elements::const_iterator p = this->phdrs_elements_->begin();
|
|
|
|
p != this->phdrs_elements_->end();
|
|
|
|
++p)
|
|
|
|
(*p)->print(f);
|
|
|
|
fprintf(f, "}\n");
|
|
|
|
}
|
2008-01-23 02:31:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
} // End namespace gold.
|