On Sat, Oct 13, 2001 at 11:56:21PM -0700, H . J . Lu wrote: > > Hi Alan, > > > > This patch > > > > http://sources.redhat.com/ml/binutils/2001-10/msg00035.html > > > > is incomplete. You cannot do any backend processing when Err, yes. Thanks for looking into it, HJ. I've been away this weekend, which is why it appears that I've been ignoring the problem. > Index: elf32-hppa.c > =================================================================== > RCS file: /work/cvs/gnu/binutils/bfd/elf32-hppa.c,v > retrieving revision 1.41 > diff -u -p -r1.41 elf32-hppa.c > --- elf32-hppa.c 2001/10/03 15:55:57 1.41 > +++ elf32-hppa.c 2001/10/14 06:43:23 > @@ -1147,7 +1147,7 @@ elf32_hppa_copy_indirect_symbol (dir, in > edir->dyn_relocs = eind->dyn_relocs; > eind->dyn_relocs = NULL; > } > - else if (eind->dyn_relocs != NULL) > + else if (dir != ind->weakdef && eind->dyn_relocs != NULL) I suspect this is not the correct fix. dyn_relocs is being used to count relocs, and probably what should happen is something like else if (eind->dyn_relocs != NULL) { struct elf32_hppa_dyn_reloc_entry *p; if (edir != eind->elf.weakdef) abort (); /* Add reloc counts against the weak sym to the strong sym list. Entries on the eind list should have a different p->sec from any on the dir list, so we don't need to merge entries. */ for (p = eind->dyn_relocs; p->next != NULL; p = p->next) ; p->next = edir->dyn_relocs; edir->dyn_relocs = eind->dyn_relocs; eind->dyn_relocs = NULL; } Untested as yet, because I don't have a testcase. I'll see if I can dream one up. > abort (); > > _bfd_elf_link_hash_copy_indirect (dir, ind); > @@ -1843,6 +1843,11 @@ elf32_hppa_adjust_dynamic_symbol (info, > } > > return true; > + } > + else > + { > + h->plt.offset = (bfd_vma) -1; > + h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT; > } This part is corrent, and similarly for the other architectures. > --- elflink.h 2001/10/05 20:32:13 1.82 > +++ elflink.h 2001/10/11 18:15:44 1.83 > + As above, we permit a non-weak definition in a shared object to > + override a weak definition in a regular object. */ I don't disagree with this change, but has this been discussed sufficiently here and on the glibc list? Alan
