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 /elf/dl-conflict.c | |
| parent | d29724f8706e4e46994d6fabafc8389f7624cd0f (diff) | |
| download | glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.zip glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.tar.gz glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.tar.bz2 | |
* 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 'elf/dl-conflict.c')
| -rw-r--r-- | elf/dl-conflict.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index e38deee..ae091ab 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -44,6 +44,7 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, /* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code. */ #define RESOLVE_MAP(ref, version, flags) (*ref = NULL, NULL) #define RESOLVE(ref, version, flags) (*ref = NULL, 0) +#define CHECK_STATIC_TLS(ref_map, sym_map) ((void) 0) #define RESOLVE_CONFLICT_FIND_MAP(map, r_offset) \ do { \ while ((resolve_conflict_map->l_map_end < (ElfW(Addr)) (r_offset)) \ |