bfd/

	* elfxx-mips.c (mips_elf_initialize_tls_index): If a TLS symbol
	has already been assigned a GOT index, copy that index to the
	current hash table entry.

ld/testsuite/
	* ld-mips-elf/tls-hidden2a.s, ld-mips-elf/tls-hidden2b.s,
	* ld/testsuite/ld-mips-elf/tls-hidden2.d,
	* ld/testsuite/ld-mips-elf/tls-hidden2-got.d: New test.
	* ld-mips-elf/mips-elf.exp: Run it.

8 files changed, 51 insertions, 1 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5bd1e341ac..f2ca17dcf4 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-04  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_initialize_tls_index): If a TLS symbol
+	has already been assigned a GOT index, copy that index to the
+	current hash table entry.
+
 2006-02-01  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Reinstate bypass
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 99a0def3b9..2675ee08a1 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -2994,7 +2994,10 @@ mips_elf_initialize_tls_index (void **entryp, void *p)
       if (g->next == NULL)
 	{
 	  if (entry->d.h->tls_type & GOT_TLS_OFFSET_DONE)
-	    return 1;
+	    {
+	      entry->gotidx = entry->d.h->tls_got_offset;
+	      return 1;
+	    }
 	  entry->d.h->tls_type |= GOT_TLS_OFFSET_DONE;
 	}
     }
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index ac9aaddef4..f7e13cdf4f 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2006-02-04  Richard Sandiford  <richard@codesourcery.com>
 
+	* ld-mips-elf/tls-hidden2a.s, ld-mips-elf/tls-hidden2b.s,
+	* ld/testsuite/ld-mips-elf/tls-hidden2.d,
+	* ld/testsuite/ld-mips-elf/tls-hidden2-got.d: New test.
+	* ld-mips-elf/mips-elf.exp: Run it.
+
+2006-02-04  Richard Sandiford  <richard@codesourcery.com>
+
 	* ld-mips-elf/rel32-n32.d: Adjust for changes in linker behaviour.
 	* ld-mips-elf/rel32-o32.d: Likewise.
 	* ld-mips-elf/rel64.d: Likewise.
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 81f24b8676..da278ae452 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -162,6 +162,11 @@ set mips_tls_tests {
      "-EB -march=mips1 -32 -KPIC" {tlslib-o32.s}
      {{objdump {-dr -m mips:isa32r2} tlslib-o32.d} {objdump -Rsj.got tlslib-o32-hidden.got}}
      "tlslib-o32-hidden.so"}
+    {"Shared library with TLS and hidden symbols (2)"
+     "-shared -melf32btsmip -T mips-lib.ld"
+     "-EB -march=mips1 -32 -KPIC" {tls-hidden2a.s tls-hidden2b.s}
+     {{objdump -drj.text tls-hidden2.d} {objdump -sj.got tls-hidden2-got.d}}
+     "tls-hidden2.so"}
 }
 
 if {[istarget mips*-*-linux*]} {
diff --git a/ld/testsuite/ld-mips-elf/tls-hidden2-got.d b/ld/testsuite/ld-mips-elf/tls-hidden2-got.d
new file mode 100644
index 0000000000..69c0982950
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/tls-hidden2-got.d
@@ -0,0 +1,6 @@
+
+.*file format.*
+
+Contents of section \.got:
+ *[0-9a-f]* 00000000 80000000 00000000 00000000 *\..*
+ *[0-9a-f]* 00000000 00000000 00000000 00000ba8 *\..*
diff --git a/ld/testsuite/ld-mips-elf/tls-hidden2.d b/ld/testsuite/ld-mips-elf/tls-hidden2.d
new file mode 100644
index 0000000000..e6322ca8a7
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/tls-hidden2.d
@@ -0,0 +1,10 @@
+
+.*file format.*
+
+Disassembly of section \.text:
+
+.* <.*>:
+.*:	8f82802c *	lw	v0,-32724\(gp\)
+	\.\.\.
+.*:	8f82802c *	lw	v0,-32724\(gp\)
+	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/tls-hidden2a.s b/ld/testsuite/ld-mips-elf/tls-hidden2a.s
new file mode 100644
index 0000000000..91a0b9e573
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/tls-hidden2a.s
@@ -0,0 +1,11 @@
+	.text
+	lw	$2,%gottprel(tls_hidden)($28)
+
+	.section .tdata,"awT"
+	.globl	tls_hidden
+	.hidden	tls_hidden
+	.type	tls_hidden,@object
+	.size	tls_hidden,4
+	.space	0xba8
+tls_hidden:
+	.word	1
diff --git a/ld/testsuite/ld-mips-elf/tls-hidden2b.s b/ld/testsuite/ld-mips-elf/tls-hidden2b.s
new file mode 100644
index 0000000000..6a8e190a9a
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/tls-hidden2b.s
@@ -0,0 +1,2 @@
+	.text
+	lw	$2,%gottprel(tls_hidden)($28)