darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* elf32-sparc.c (elf32_sparc_relocate_section): Don't abort

Browse source 
when statically linking PIC code.
	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
This commit is contained in:
Alan Modra 2004-04-14 09:50:07 +00:00
parent d766e8ec50
commit 6de00a7823
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
2004-04-14 Alan Modra <amodra@bigpond.net.au>
* elf32-sparc.c (elf32_sparc_relocate_section): Don't abort
when statically linking PIC code.
* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
2004-04-11 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* config.bfd: Remove mips*-*-mach3* and mips*-dec-mach3* targets.

5
bfd/elf32-sparc.c
View file

@ -2323,7 +2323,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
if (h == NULL)
break;
if (h->plt.offset == (bfd_vma) -1)
if (h->plt.offset == (bfd_vma) -1 || htab->splt == NULL)
{
/* We didn't make a PLT entry for this symbol. This
happens when statically linking PIC code, or when
@ -2331,9 +2331,6 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
break;
}
if (htab->splt == NULL)
abort ();
relocation = (htab->splt->output_section->vma
+ htab->splt->output_offset
+ h->plt.offset);

11
bfd/elf64-sparc.c
View file

@ -2027,7 +2027,8 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
else
got_base = elf_hash_table (info)->hgot->root.u.def.value;
sgot = splt = sreloc = NULL;
sgot = sreloc = NULL;
splt = bfd_get_section_by_name (dynobj, ".plt");
rel = relocs;
relend = relocs + NUM_SHDR_ENTRIES (& elf_section_data (input_section)->rel_hdr);
@ -2409,7 +2410,7 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
procedure linkage table. */
BFD_ASSERT (h != NULL);
if (h->plt.offset == (bfd_vma) -1)
if (h->plt.offset == (bfd_vma) -1 || splt == NULL)
{
/* We didn't make a PLT entry for this symbol. This
happens when statically linking PIC code, or when
@ -2417,12 +2418,6 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
goto do_default;
}
if (splt == NULL)
{
splt = bfd_get_section_by_name (dynobj, ".plt");
BFD_ASSERT (splt != NULL);
}
relocation = (splt->output_section->vma
+ splt->output_offset
+ sparc64_elf_plt_entry_offset (h->plt.offset));