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

	* 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.

diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 60122c5..5b9c24f 100644 (file)
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -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 */

diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index 118a4b7..afae50a 100644 (file)
--- 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 */