From caec41ff606409212f57e42f99b61194e248da05 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Fri, 14 Nov 2003 16:05:13 +0000 Subject: [PATCH] * elfxx-mips.c (mips_elf_merge_gots): Weaken assert for local GOT entries. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f3afdca153..63fd6fc48a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2003-11-14 Daniel Jacobowitz + + * elfxx-mips.c (mips_elf_merge_gots): Weaken assert for local + GOT entries. + 2003-11-13 Martin Schwidefsky * elf32-s390.c (elf_s390_relocate_section): Only convert R_390_32 diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index b5456831e9..b7224a5d07 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -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 -- 2.34.1