* elfxx-mips.c (mips_elf_merge_gots): Always use maxcnt.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 788c9e20ab5279860b177e9b5ea322584e9247c7..b3ad7d6fb7f979fa690fd3e46f2d7875f0af7a52 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-01  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * elfxx-mips.c (mips_elf_merge_gots): Always use maxcnt.
+
 2006-10-31  Alan Modra  <amodra@bigpond.net.au>
 
        * elf.c (elfcore_write_note): Pad note descriptor to 4-byte

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 5483cf2b02c01aa0e59c0c888579d3abe504759e..a1e09fd0c0550ccdc514981abac5f63d8d4eb35b 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -3105,8 +3105,7 @@ mips_elf_merge_gots (void **bfd2got_, void *p)
   if (tcount > 0)
     {
       unsigned int primary_total = lcount + tcount + arg->global_count;
-      if (primary_total * MIPS_ELF_GOT_SIZE (bfd2got->bfd)
-         >= MIPS_ELF_GOT_MAX_SIZE (arg->info))
+      if (primary_total > maxcnt)
        too_many_for_tls = TRUE;
     }