diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 51232de71d..326207a3e2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_elf_record_local_got_symbol): Always set
+	gotidx to -1.
+
 2013-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* elfxx-mips.c (mips_elf_multi_got): Simplify size calculation.
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 07546babce..3ed4596baa 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -3777,9 +3777,9 @@ mips_elf_record_local_got_symbol (bfd *abfd, long symndx, bfd_vma addend,
       return TRUE;
     }
 
+  entry.gotidx = -1;
   if (tls_flag != 0)
     {
-      entry.gotidx = -1;
       entry.tls_type = tls_flag;
       if (tls_flag == GOT_TLS_IE)
 	g->tls_gotno += 1;
@@ -3793,7 +3793,7 @@ mips_elf_record_local_got_symbol (bfd *abfd, long symndx, bfd_vma addend,
     }
   else
     {
-      entry.gotidx = g->local_gotno++;
+      g->local_gotno += 1;
       entry.tls_type = 0;
     }