* 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.
This commit is contained in:
Richard Sandiford 2006-02-04 08:29:58 +00:00
parent 2f2817dbda
commit 4005427f86
8 changed files with 51 additions and 1 deletions

View File

@ -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

View File

@ -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;
}
}

View File

@ -1,3 +1,10 @@
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.

View File

@ -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*]} {

View File

@ -0,0 +1,6 @@
.*file format.*
Contents of section \.got:
*[0-9a-f]* 00000000 80000000 00000000 00000000 *\..*
*[0-9a-f]* 00000000 00000000 00000000 00000ba8 *\..*

View File

@ -0,0 +1,10 @@
.*file format.*
Disassembly of section \.text:
.* <.*>:
.*: 8f82802c * lw v0,-32724\(gp\)
\.\.\.
.*: 8f82802c * lw v0,-32724\(gp\)
\.\.\.

View File

@ -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

View File

@ -0,0 +1,2 @@
.text
lw $2,%gottprel(tls_hidden)($28)