From 59b089943c568c6245f8c87e06f57a4fccdcca58 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 11 Feb 2013 17:38:53 +0000 Subject: [PATCH] bfd/ * elfxx-mips.c (mips_elf_multi_got): Simplify size calculation. --- bfd/ChangeLog | 4 ++++ bfd/elfxx-mips.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1b51b61..51232de 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,9 @@ 2013-02-11 Richard Sandiford + * elfxx-mips.c (mips_elf_multi_got): Simplify size calculation. + +2013-02-11 Richard Sandiford + * elfxx-mips.c (mips_got_info): Move global_gotsym to... (mips_elf_link_hash_table): ...here. Update rest of file accordingly. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 4a4e061..07546ba 100644 --- 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); -- 2.7.4