2001-08-30 H.J. Lu <hjl@gnu.org>
* elf32-mips.c (mips_elf_calculate_relocation): Revert the last 2 changes. (_bfd_mips_elf_adjust_dynamic_symbol): Allocate dynamic relocations for weak definitions.
This commit is contained in:
parent
f41e352811
commit
2bab97856d
|
@ -1,3 +1,10 @@
|
||||||
|
2001-08-30 H.J. Lu <hjl@gnu.org>
|
||||||
|
|
||||||
|
* elf32-mips.c (mips_elf_calculate_relocation): Revert the last
|
||||||
|
2 changes.
|
||||||
|
(_bfd_mips_elf_adjust_dynamic_symbol): Allocate dynamic
|
||||||
|
relocations for weak definitions.
|
||||||
|
|
||||||
2001-08-30 H.J. Lu <hjl@gnu.org>
|
2001-08-30 H.J. Lu <hjl@gnu.org>
|
||||||
|
|
||||||
* Makefile.am (BFD32_BACKENDS): Add elf32-h8300.lo.
|
* Makefile.am (BFD32_BACKENDS): Add elf32-h8300.lo.
|
||||||
|
|
|
@ -6332,10 +6332,8 @@ mips_elf_calculate_relocation (abfd,
|
||||||
if ((info->shared
|
if ((info->shared
|
||||||
|| (elf_hash_table (info)->dynamic_sections_created
|
|| (elf_hash_table (info)->dynamic_sections_created
|
||||||
&& h != NULL
|
&& h != NULL
|
||||||
&& h->root.root.type != bfd_link_hash_undefweak
|
&& ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)
|
||||||
&& (h->root.root.type == bfd_link_hash_defweak
|
!= 0)))
|
||||||
|| (h->root.elf_link_hash_flags
|
|
||||||
& ELF_LINK_HASH_DEF_REGULAR) == 0)))
|
|
||||||
&& (input_section->flags & SEC_ALLOC) != 0)
|
&& (input_section->flags & SEC_ALLOC) != 0)
|
||||||
{
|
{
|
||||||
/* If we're creating a shared library, or this relocation is
|
/* If we're creating a shared library, or this relocation is
|
||||||
|
@ -8135,7 +8133,9 @@ _bfd_mips_elf_adjust_dynamic_symbol (info, h)
|
||||||
hmips = (struct mips_elf_link_hash_entry *) h;
|
hmips = (struct mips_elf_link_hash_entry *) h;
|
||||||
if (! info->relocateable
|
if (! info->relocateable
|
||||||
&& hmips->possibly_dynamic_relocs != 0
|
&& hmips->possibly_dynamic_relocs != 0
|
||||||
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
&& (h->root.type == bfd_link_hash_defweak
|
||||||
|
|| (h->elf_link_hash_flags
|
||||||
|
& ELF_LINK_HASH_DEF_REGULAR) == 0))
|
||||||
{
|
{
|
||||||
mips_elf_allocate_dynamic_relocations (dynobj,
|
mips_elf_allocate_dynamic_relocations (dynobj,
|
||||||
hmips->possibly_dynamic_relocs);
|
hmips->possibly_dynamic_relocs);
|
||||||
|
|
Loading…
Reference in New Issue