* target-reloc.h (Default_scan_relocatable_relocs): For each
	function, map r_type == 0 to RELOC_DISCARD.
This commit is contained in:
Ian Lance Taylor 2008-12-12 02:41:39 +00:00
parent 5f3563ea7a
commit c250817872
2 changed files with 26 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2008-12-11 Ian Lance Taylor <iant@google.com>
PR 7091
* target-reloc.h (Default_scan_relocatable_relocs): For each
function, map r_type == 0 to RELOC_DISCARD.
2008-12-10 Cary Coutant <ccoutant@google.com>
* layout.cc (Layout::add_comdat): Allow COMDAT group from a replacement

View File

@ -308,14 +308,24 @@ class Default_scan_relocatable_relocs
// Return the strategy to use for a local symbol which is not a
// section symbol, given the relocation type.
inline Relocatable_relocs::Reloc_strategy
local_non_section_strategy(unsigned int, Relobj*)
{ return Relocatable_relocs::RELOC_COPY; }
local_non_section_strategy(unsigned int r_type, Relobj*)
{
// We assume that relocation type 0 is NONE. Targets which are
// different must override.
if (r_type == 0)
return Relocatable_relocs::RELOC_DISCARD;
return Relocatable_relocs::RELOC_COPY;
}
// Return the strategy to use for a local symbol which is a section
// symbol, given the relocation type.
inline Relocatable_relocs::Reloc_strategy
local_section_strategy(unsigned int r_type, Relobj* object)
{
// We assume that relocation type 0 is NONE. Targets which are
// different must override.
if (r_type == 0)
return Relocatable_relocs::RELOC_DISCARD;
if (sh_type == elfcpp::SHT_RELA)
return Relocatable_relocs::RELOC_ADJUST_FOR_SECTION_RELA;
else
@ -342,8 +352,14 @@ class Default_scan_relocatable_relocs
// Return the strategy to use for a global symbol, given the
// relocation type, the object, and the symbol index.
inline Relocatable_relocs::Reloc_strategy
global_strategy(unsigned int, Relobj*, unsigned int)
{ return Relocatable_relocs::RELOC_COPY; }
global_strategy(unsigned int r_type, Relobj*, unsigned int)
{
// We assume that relocation type 0 is NONE. Targets which are
// different must override.
if (r_type == 0)
return Relocatable_relocs::RELOC_DISCARD;
return Relocatable_relocs::RELOC_COPY;
}
};
// Scan relocs during a relocatable link. This is a default