picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2002-10-17 Roland McGrath <roland@redhat.com>

Browse source 
* sysdeps/x86_64/dl-machine.h (elf_machine_rela): Do CHECK_STATIC_TLS
	before performing the reloc, not before.
	* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
This commit is contained in:
Roland McGrath 2002-10-17 19:44:19 +00:00
parent 2e2dc1a558
commit eb775e678d
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sysdeps/i386/dl-machine.h
View file

@ -432,7 +432,6 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
Therefore the offset is already correct. */
if (sym != NULL)
*reloc_addr = sym->st_value;
CHECK_STATIC_TLS (map, sym_map);
# endif
break;
case R_386_TLS_TPOFF32:
@ -445,8 +444,10 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
thread pointer. To get the variable position in the TLS
block we subtract the offset from that of the TLS block. */
if (sym != NULL)
*reloc_addr += sym_map->l_tls_offset - sym->st_value;
CHECK_STATIC_TLS (map, sym_map);
{
*reloc_addr += sym_map->l_tls_offset - sym->st_value;
CHECK_STATIC_TLS (map, sym_map);
}
# endif
break;
case R_386_TLS_TPOFF:
@ -458,8 +459,10 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
It is a negative value which will be added to the
thread pointer. */
if (sym != NULL)
*reloc_addr += sym->st_value - sym_map->l_tls_offset;
CHECK_STATIC_TLS (map, sym_map);
{
*reloc_addr += sym->st_value - sym_map->l_tls_offset;
CHECK_STATIC_TLS (map, sym_map);
}
# endif
break;
#endif /* use TLS */

6
sysdeps/x86_64/dl-machine.h
View file

@ -429,14 +429,14 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
if (sym != NULL)
# endif
{
# ifndef RTLD_BOOTSTRAP
CHECK_STATIC_TLS (map, sym_map);
# endif
/* We know the offset of the object the symbol is contained in.
It is a negative value which will be added to the
thread pointer. */
*reloc_addr = (sym->st_value + reloc->r_addend
- sym_map->l_tls_offset);
# ifndef RTLD_BOOTSTRAP
CHECK_STATIC_TLS (map, sym_map);
# endif
}
break;
#endif /* use TLS */