espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-09-10 08:02:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elf32-i386.c (elf_i386_relocate_section): Correct and expand the

Browse Source 
list of cases for which relocation need not be computed.
	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
This commit is contained in:
Ian Lance Taylor
1994-12-20 19:07:11 +00:00
parent 972b240176
commit 9b09a01580
3 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bfd/ChangeLog
View File

@ -1,3 +1,16 @@
Tue Dec 20 13:58:01 1994 Ian Lance Taylor <ian@sanguine.cygnus.com>
* elf32-i386.c (elf_i386_relocate_section): Correct and expand the
list of cases for which relocation need not be computed.
* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
start-sanitize-arc
Tue Dec 20 09:01:01 1994 Doug Evans <dje@canuck.cygnus.com>
* elf32-arc.c (elf_arc_howto_table, R_ARC_B22_PCREL): Value is
right-shifted 2 bits. Fix dst_mask.
end-sanitize-arc
Mon Dec 19 23:09:16 1994 Jeff Law (law@snake.cs.utah.edu) Mon Dec 19 23:09:16 1994 Jeff Law (law@snake.cs.utah.edu)
* elf32-hppa.c (elf32_hppa_read_symext_info): Delete do_locals and * elf32-hppa.c (elf32_hppa_read_symext_info): Delete do_locals and

34
bfd/elf32-i386.c
View File

@ -647,11 +647,13 @@ elf_i386_adjust_dynamic_symbol (info, h)
if (s->_raw_size == 0) if (s->_raw_size == 0)
s->_raw_size += PLT_ENTRY_SIZE; s->_raw_size += PLT_ENTRY_SIZE;
/* If we are not generating a shared library, or if the symbol /* If this symbol is not defined in a regular file, and we are
is not defined, set the symbol to this location in the .plt. not generating a shared library, then set the symbol to this
This is required to make function pointers compare as equal location in the .plt. This is required to make function
between the normal executable and the shared library. */ pointers compare as equal between the normal executable and
if (! info->shared || h->root.type != bfd_link_hash_defined) the shared library. */
if (! info->shared
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
{ {
h->root.u.def.section = s; h->root.u.def.section = s;
h->root.u.def.value = s->_raw_size; h->root.u.def.value = s->_raw_size;
@ -1030,9 +1032,25 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
if (h->root.type == bfd_link_hash_defined) if (h->root.type == bfd_link_hash_defined)
{ {
sec = h->root.u.def.section; sec = h->root.u.def.section;
relocation = (h->root.u.def.value if (r_type == R_386_GOTPC
+ sec->output_section->vma || (r_type == R_386_PLT32
+ sec->output_offset); && h->plt_offset != (bfd_vma) -1)
|| (r_type == R_386_GOT32
&& elf_hash_table (info)->dynamic_sections_created)
|| (info->shared
&& (r_type == R_386_32
|| r_type == R_386_PC32)
&& (input_section->flags & SEC_ALLOC) != 0))
{
/* In these cases, we don't need the relocation
value. We check specially because in some
obscure cases sec->output_section will be NULL. */
relocation = 0;
}
else
relocation = (h->root.u.def.value
+ sec->output_section->vma
+ sec->output_offset);
} }
else if (h->root.type == bfd_link_hash_weak) else if (h->root.type == bfd_link_hash_weak)
relocation = 0; relocation = 0;

50
bfd/elf32-sparc.c
View File

@ -619,11 +619,13 @@ elf32_sparc_adjust_dynamic_symbol (info, h)
return false; return false;
} }
/* If we are not generating a shared library, or if the symbol /* If this symbol is not defined in a regular file, and we are
is not defined, set the symbol to this location in the .plt. not generating a shared library, then set the symbol to this
This is required to make function pointers compare as equal location in the .plt. This is required to make function
between the normal executable and the shared library. */ pointers compare as equal between the normal executable and
if (! info->shared || h->root.type != bfd_link_hash_defined) the shared library. */
if (! info->shared
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
{ {
h->root.u.def.section = s; h->root.u.def.section = s;
h->root.u.def.value = s->_raw_size; h->root.u.def.value = s->_raw_size;
@ -1005,9 +1007,41 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
if (h->root.type == bfd_link_hash_defined) if (h->root.type == bfd_link_hash_defined)
{ {
sec = h->root.u.def.section; sec = h->root.u.def.section;
relocation = (h->root.u.def.value if ((r_type == R_SPARC_WPLT30
+ sec->output_section->vma && h->plt_offset != (bfd_vma) -1)
+ sec->output_offset); || ((r_type == R_SPARC_GOT10
|| r_type == R_SPARC_GOT13
|| r_type == R_SPARC_GOT22)
&& elf_hash_table (info)->dynamic_sections_created)
|| (info->shared
&& (input_section->flags & SEC_ALLOC) != 0
&& (r_type == R_SPARC_8
|| r_type == R_SPARC_16
|| r_type == R_SPARC_32
|| r_type == R_SPARC_DISP8
|| r_type == R_SPARC_DISP16
|| r_type == R_SPARC_DISP32
|| r_type == R_SPARC_WDISP30
|| r_type == R_SPARC_WDISP22
|| r_type == R_SPARC_HI22
|| r_type == R_SPARC_22
|| r_type == R_SPARC_13
|| r_type == R_SPARC_LO10
|| r_type == R_SPARC_UA32
|| ((r_type == R_SPARC_PC10
|| r_type == R_SPARC_PC22)
&& strcmp (h->root.root.string,
"_GLOBAL_OFFSET_TABLE_") != 0))))
{
/* In these cases, we don't need the relocation
value. We check specially because in some
obscure cases sec->output_section will be NULL. */
relocation = 0;
}
else
relocation = (h->root.u.def.value
+ sec->output_section->vma
+ sec->output_offset);
} }
else if (h->root.type == bfd_link_hash_weak) else if (h->root.type == bfd_link_hash_weak)
relocation = 0; relocation = 0;