This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Weaken a MIPS BFD_ASSERT
- From: Daniel Jacobowitz <drow at mvista dot com>
- To: binutils at sources dot redhat dot com
- Date: Tue, 11 Nov 2003 15:33:07 -0500
- Subject: Weaken a MIPS BFD_ASSERT
I think this is right. The assumption was that two local symbols would
never be combined; but a reference to a global symbol with
entry->d.h->forced_local set will cause two local symbols to coalesce. So
the assert should allow for that. The resulting application seems to work
OK.
OK?
--
Daniel Jacobowitz
MontaVista Software Debian GNU/Linux Developer
2003-11-11 Daniel Jacobowitz <drow@mvista.com>
* elfxx-mips.c (mips_elf_merge_gots): Weaken assert for local
GOT entries.
Index: elfxx-mips.c
===================================================================
RCS file: /big/fsf/rsync/src-cvs/src/bfd/elfxx-mips.c,v
retrieving revision 1.78
diff -u -p -r1.78 elfxx-mips.c
--- elfxx-mips.c 13 Oct 2003 19:51:09 -0000 1.78
+++ elfxx-mips.c 11 Nov 2003 20:26:49 -0000
@@ -2263,7 +2263,7 @@ mips_elf_merge_gots (bfd2got_, p)
got entries, since they're all in the master got_entries hash
table anyway. */
- BFD_ASSERT (old_lcount + lcount == arg->primary->local_gotno);
+ BFD_ASSERT (old_lcount + lcount >= arg->primary->local_gotno);
BFD_ASSERT (old_gcount + gcount >= arg->primary->global_gotno);
arg->primary_count = arg->primary->local_gotno
@@ -2287,7 +2287,7 @@ mips_elf_merge_gots (bfd2got_, p)
htab_delete (g->got_entries);
- BFD_ASSERT (old_lcount + lcount == arg->current->local_gotno);
+ BFD_ASSERT (old_lcount + lcount >= arg->current->local_gotno);
BFD_ASSERT (old_gcount + gcount >= arg->current->global_gotno);
arg->current_count = arg->current->local_gotno