From: drow <drow>
Date: Wed, 1 Nov 2006 16:07:42 +0000 (+0000)
Subject: 	* elfxx-mips.c (mips_elf_merge_gots): Always use maxcnt.
X-Git-Tag: drop_9x_support_start~1263
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d61b456c5fcec1ddf7657a6049a94b1127b2b588;p=pf3gnuchains%2Fpf3gnuchains4x.git

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 788c9e20ab..b3ad7d6fb7 100644
--- 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 5483cf2b02..a1e09fd0c0 100644
--- 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;
     }