From eb775e678d2b66bde8ca5eb378326bace28cb625 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 17 Oct 2002 19:44:19 +0000 Subject: 2002-10-17 Roland McGrath * 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. --- sysdeps/x86_64/dl-machine.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sysdeps/x86_64/dl-machine.h') diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 118a4b75b5..afae50ac80 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -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 */ -- cgit 1.4.1