Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Allow target to derive from Copy_relocs class.

Browse Source 
2014-04-15  Sasa Stankovic  <Sasa.Stankovic@imgtec.com>

gold/
	* copy-relocs.cc (Copy_relocs::Copy_reloc_entry::emit): Remove and
	inline into ...
	(Copy_relocs::emit): ... here.
	* copy-relocs.h (Copy_reloc_entry): Change from class to struct.
	(Copy_reloc_entry::make_copy_reloc): Change from private to protected.
	(Copy_reloc_entry::entries_): Change from private to protected.
This commit is contained in:
Cary Coutant
2014-04-15 11:19:18 -07:00
parent 5da151d470
commit 91f43acd5d
3 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gold/copy-relocs.h
View File

@@ -54,7 +54,7 @@ class Copy_relocs
public:
Copy_relocs(unsigned int copy_reloc_type)
: copy_reloc_type_(copy_reloc_type), dynbss_(NULL), entries_()
: entries_(), copy_reloc_type_(copy_reloc_type), dynbss_(NULL)
{ }
// This is called while scanning relocs if we see a relocation
@@ -87,16 +87,15 @@ class Copy_relocs
Output_data*, off_t,
Output_data_reloc<sh_type, true, size, big_endian>*);
private:
protected:
typedef typename elfcpp::Elf_types<size>::Elf_Addr Address;
typedef typename elfcpp::Elf_types<size>::Elf_Addr Addend;
// This POD class holds the relocations we are saving. We will emit
// these relocations if it turns out that the symbol does not
// require a COPY relocation.
class Copy_reloc_entry
struct Copy_reloc_entry
{
public:
Copy_reloc_entry(Symbol* sym, unsigned int reloc_type,
Sized_relobj_file<size, big_endian>* relobj,
unsigned int shndx,
@@ -107,13 +106,6 @@ class Copy_relocs
address_(address), addend_(addend)
{ }
// Emit this reloc if appropriate. This is called after we have
// scanned all the relocations, so we know whether we emitted a
// COPY relocation for SYM_.
void
emit(Output_data_reloc<sh_type, true, size, big_endian>*);
private:
Symbol* sym_;
unsigned int reloc_type_;
Sized_relobj_file<size, big_endian>* relobj_;
@@ -123,20 +115,24 @@ class Copy_relocs
Addend addend_;
};
// Make a new COPY reloc and emit it.
void
make_copy_reloc(Symbol_table*, Layout*, Sized_symbol<size>*,
Output_data_reloc<sh_type, true, size, big_endian>*);
// A list of relocs to be saved.
typedef std::vector<Copy_reloc_entry> Copy_reloc_entries;
// The list of relocs we are saving.
Copy_reloc_entries entries_;
private:
// Return whether we need a COPY reloc.
bool
need_copy_reloc(Sized_symbol<size>* gsym,
Sized_relobj_file<size, big_endian>* object,
unsigned int shndx) const;
// Make a new COPY reloc and emit it.
void
make_copy_reloc(Symbol_table*, Layout*, Sized_symbol<size>*,
Output_data_reloc<sh_type, true, size, big_endian>*);
// Save a reloc against SYM for possible emission later.
void
save(Symbol*, Sized_relobj_file<size, big_endian>*, unsigned int shndx,
@@ -147,8 +143,6 @@ class Copy_relocs
// The dynamic BSS data which goes into the .bss section. This is
// where variables which require COPY relocations are placed.
Output_data_space* dynbss_;
// The list of relocs we are saving.
Copy_reloc_entries entries_;
};
} // End namespace gold.