diff options
| author | Roland McGrath <roland@gnu.org> | 2002-10-17 12:10:17 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-10-17 12:10:17 +0000 |
| commit | 2430d57a13f4f10312e13c58962cd9104e6428fd (patch) | |
| tree | 6690ca0a7115c798e9c34cf24f55acf14311d661 /sysdeps/x86_64/dl-machine.h | |
| parent | d29724f8706e4e46994d6fabafc8389f7624cd0f (diff) | |
| download | glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.tar.gz glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.tar.xz glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.zip | |
* elf/dl-load.c (_dl_map_object_from_fd): Don't check DF_STATIC_TLS.
* elf/dl-reloc.c (_dl_relocate_object: CHECK_STATIC_TLS): New macro to signal error if an IE-model TLS reloc resolved to a dlopen'd module. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela): Call it after performing TPOFF relocs. * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. * elf/dl-conflict.c (CHECK_STATIC_TLS): New macro (no-op). * elf/dl-close.c (remove_slotinfo): Change asserts so as not to crash when closing a partially-initialized object. * elf/dl-load.c (_dl_map_object_from_fd) [! USE_TLS]: Call lose instead of _dl_fatal_printf when we see PT_TLS.
Diffstat (limited to 'sysdeps/x86_64/dl-machine.h')
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 740d6b7feb..118a4b75b5 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -428,11 +428,16 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, # ifndef RTLD_BOOTSTRAP if (sym != NULL) # 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); + { + /* 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 */ |