aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2006-11-01 16:07:46 +0000
committerDaniel Jacobowitz <drow@false.org>2006-11-01 16:07:46 +0000
commit3110dbc9c3bf4ce8688747811e871e48819bd09b (patch)
tree01c8044d01f4e286d0f89c94fa0ab04e9f8bbaf8 /bfd
parent06d2da930da0c71b4ef494894382b62c6b5bd1e9 (diff)
downloadgdb-3110dbc9c3bf4ce8688747811e871e48819bd09b.zip
gdb-3110dbc9c3bf4ce8688747811e871e48819bd09b.tar.gz
gdb-3110dbc9c3bf4ce8688747811e871e48819bd09b.tar.bz2
* elfxx-mips.c (mips_elf_merge_gots): Always use maxcnt.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/elfxx-mips.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 788c9e2..b3ad7d6 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 5483cf2..a1e09fd 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;
}