* elfxx-mips.c (mips_elf_merge_gots): Weaken assert for local

	GOT entries.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f3afdca1531181c71721ec9e23e60164128d2da4..63fd6fc48ae2cc3ff9fe69a19745174807383177 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-14  Daniel Jacobowitz  <drow@mvista.com>
+
+       * elfxx-mips.c (mips_elf_merge_gots): Weaken assert for local
+       GOT entries.
+
 2003-11-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * 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 b5456831e9978e70713f32357e36df1d5d47141f..b7224a5d0728134e61d4205b32b4f483e601f5d7 100644 (file)
--- 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