From 2bab97856da7437912bee19ffaf296cccc14ab04 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 30 Aug 2001 21:26:26 +0000 Subject: [PATCH] 2001-08-30 H.J. Lu * elf32-mips.c (mips_elf_calculate_relocation): Revert the last 2 changes. (_bfd_mips_elf_adjust_dynamic_symbol): Allocate dynamic relocations for weak definitions. --- bfd/ChangeLog | 7 +++++++ bfd/elf32-mips.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index afbae91c2f3..1eba7a82f9d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2001-08-30 H.J. Lu + + * 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 * Makefile.am (BFD32_BACKENDS): Add elf32-h8300.lo. diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index 4d224df5d33..6eecd5511df 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -6332,10 +6332,8 @@ mips_elf_calculate_relocation (abfd, if ((info->shared || (elf_hash_table (info)->dynamic_sections_created && h != NULL - && h->root.root.type != bfd_link_hash_undefweak - && (h->root.root.type == bfd_link_hash_defweak - || (h->root.elf_link_hash_flags - & ELF_LINK_HASH_DEF_REGULAR) == 0))) + && ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) + != 0))) && (input_section->flags & SEC_ALLOC) != 0) { /* 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; if (! info->relocateable && 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, hmips->possibly_dynamic_relocs); -- 2.30.2