From 3110dbc9c3bf4ce8688747811e871e48819bd09b Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 1 Nov 2006 16:07:46 +0000 Subject: [PATCH] * elfxx-mips.c (mips_elf_merge_gots): Always use maxcnt. --- bfd/ChangeLog | 4 ++++ bfd/elfxx-mips.c | 3 +-- 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 + + * elfxx-mips.c (mips_elf_merge_gots): Always use maxcnt. + 2006-10-31 Alan Modra * 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; } -- 2.7.4