* elfxx-mips.c (mips_elf_calculate_relocation): Handle only
forced local symbols here. (mips_elf_create_dynamic_relocation): Likewise. (_bfd_mips_elf_finish_dynamic_symbol): Fix typo in comment.
This commit is contained in:
parent
7fabd0295e
commit
6ece8836a6
2 changed files with 11 additions and 6 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2005-11-03 Thiemo Seufer <ths@networkno.de>
|
||||||
|
|
||||||
|
* elfxx-mips.c (mips_elf_calculate_relocation): Handle only
|
||||||
|
forced local symbols here.
|
||||||
|
(mips_elf_create_dynamic_relocation): Likewise.
|
||||||
|
(_bfd_mips_elf_finish_dynamic_symbol): Fix typo in comment.
|
||||||
|
|
||||||
2005-11-03 Alan Modra <amodra@bigpond.net.au>
|
2005-11-03 Alan Modra <amodra@bigpond.net.au>
|
||||||
|
|
||||||
* elf.c (elf_fake_sections): When calculating tbss size, just use
|
* elf.c (elf_fake_sections): When calculating tbss size, just use
|
||||||
|
|
|
@ -3918,7 +3918,7 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
|
||||||
if (h->tls_type == GOT_NORMAL
|
if (h->tls_type == GOT_NORMAL
|
||||||
&& (! elf_hash_table(info)->dynamic_sections_created
|
&& (! elf_hash_table(info)->dynamic_sections_created
|
||||||
|| (info->shared
|
|| (info->shared
|
||||||
&& (info->symbolic || h->root.dynindx == -1)
|
&& (info->symbolic || h->root.forced_local)
|
||||||
&& h->root.def_regular)))
|
&& h->root.def_regular)))
|
||||||
{
|
{
|
||||||
/* This is a static link or a -Bsymbolic link. The
|
/* This is a static link or a -Bsymbolic link. The
|
||||||
|
@ -4483,10 +4483,8 @@ mips_elf_create_dynamic_relocation (bfd *output_bfd,
|
||||||
/* We must now calculate the dynamic symbol table index to use
|
/* We must now calculate the dynamic symbol table index to use
|
||||||
in the relocation. */
|
in the relocation. */
|
||||||
if (h != NULL
|
if (h != NULL
|
||||||
&& (! info->symbolic || !h->root.def_regular)
|
&& (!h->root.def_regular
|
||||||
/* h->root.dynindx may be -1 if this symbol was marked to
|
|| (info->shared && !info->symbolic && !h->root.forced_local)))
|
||||||
become local. */
|
|
||||||
&& h->root.dynindx != -1)
|
|
||||||
{
|
{
|
||||||
indx = h->root.dynindx;
|
indx = h->root.dynindx;
|
||||||
if (SGI_COMPAT (output_bfd))
|
if (SGI_COMPAT (output_bfd))
|
||||||
|
@ -7379,7 +7377,7 @@ _bfd_mips_elf_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
MIPS_ELF_STUB_SECTION_NAME (dynobj));
|
MIPS_ELF_STUB_SECTION_NAME (dynobj));
|
||||||
BFD_ASSERT (s != NULL);
|
BFD_ASSERT (s != NULL);
|
||||||
|
|
||||||
/* FIXME: Can h->dynindex be more than 64K? */
|
/* FIXME: Can h->dynindx be more than 64K? */
|
||||||
if (h->dynindx & 0xffff0000)
|
if (h->dynindx & 0xffff0000)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue