From 2430d57a13f4f10312e13c58962cd9104e6428fd Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 17 Oct 2002 12:10:17 +0000 Subject: * 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. --- elf/dl-conflict.c | 1 + 1 file changed, 1 insertion(+) (limited to 'elf/dl-conflict.c') diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index e38deee9de..ae091abd27 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)) \ -- cgit v1.2.3