aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-07-16 00:18:20 +0000
committerUlrich Drepper <drepper@redhat.com>2002-07-16 00:18:20 +0000
commit807bce82b385e7542f94a2fef994725b368a13b4 (patch)
tree7bdb9407427cdf5888529a5bb909bae0a81f1734 /elf
parent706d1dee4692cc5419275fcddc4518933ff2a39e (diff)
downloadglibc-807bce82b385e7542f94a2fef994725b368a13b4.tar
glibc-807bce82b385e7542f94a2fef994725b368a13b4.tar.gz
glibc-807bce82b385e7542f94a2fef994725b368a13b4.tar.bz2
glibc-807bce82b385e7542f94a2fef994725b368a13b4.zip
Update.
* elf/dl-load.c (_dl_map_object_from_fd): If loaded object uses TLS fail is USE_TLS is not defined.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index fd80be60bc..0948b8f21e 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -940,8 +940,8 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
}
break;
-#ifdef USE_TLS
case PT_TLS:
+#ifdef USE_TLS
if (ph->p_memsz > 0)
{
l->l_tls_blocksize = ph->p_memsz;
@@ -954,8 +954,12 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
/* Assign the next available module ID. */
l->l_tls_modid = _dl_next_tls_modid ();
}
- break;
+#else
+ /* Uh-oh, the binary expects TLS support but we cannot
+ provide it. */
+ _dl_fatal_printf ("cannot handle file '%s' with TLS data", name);
#endif
+ break;
}
/* Now process the load commands and map segments into memory. */