bfd/

	* elfxx-mips.c (mips_elf_multi_got): Simplify size calculation.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1b51b61ca622514beb346b492ee5f8207c760527..51232de71d6e52da34b8b5b208b366c36b2ea363 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * elfxx-mips.c (mips_elf_multi_got): Simplify size calculation.
+
 2013-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * elfxx-mips.c (mips_got_info): Move global_gotsym to...

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 4a4e061544fddcef23883142dbf073fe4c44e22c..07546babce4083621844020a4fbbe143436bf89f 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -4705,9 +4705,7 @@ mips_elf_multi_got (bfd *abfd, struct bfd_link_info *info,
     }
   while (g);
 
-  got->size = (gg->next->local_gotno
-              + gg->next->global_gotno
-              + gg->next->tls_gotno) * MIPS_ELF_GOT_SIZE (abfd);
+  got->size = assign * MIPS_ELF_GOT_SIZE (abfd);
 
   needed_relocs = 0;
   set_got_offset_arg.value = MIPS_ELF_GOT_SIZE (abfd);