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-load.c | |
| 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 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index db9391ea66..2f2a9be566 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -957,7 +957,9 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, #else /* Uh-oh, the binary expects TLS support but we cannot provide it. */ - _dl_fatal_printf ("cannot handle file '%s' with TLS data\n", name); + errval = 0; + errstring = N_("cannot handle TLS data"); + goto call_lose; #endif break; } @@ -1173,11 +1175,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, /* Make sure we are not dlopen'ing an object that has the DF_1_NOOPEN flag set. */ - if ((__builtin_expect (l->l_flags_1 & DF_1_NOOPEN, 0) -#ifdef USE_TLS - || __builtin_expect (l->l_flags & DF_STATIC_TLS, 0) -#endif - ) + if (__builtin_expect (l->l_flags_1 & DF_1_NOOPEN, 0) && (mode & __RTLD_DLOPEN)) { /* We are not supposed to load this object. Free all resources. */ |