summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-09-29 17:07:11 +0000
committerUlrich Drepper <drepper@redhat.com>2006-09-29 17:07:11 +0000
commit154619b591282fc664dbedaee4fab8b57206c9ab (patch)
tree82698279e96ec2a5628414578a9ea63f0c038d66 /elf
parent1c31aa7979138ee5bb443e5adfd6c22ff0680fd8 (diff)
downloadglibc-154619b591282fc664dbedaee4fab8b57206c9ab.tar.gz
[BZ #3273]
2006-09-29 Ulrich Drepper <drepper@redhat.com> [BZ #3273] * nscd/nscd_initgroups.c (__nscd_getgrouplist): It is OK to have found no group members. Patch by Petr Baudis. 2006-09-29 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (_dl_start_final): If not USE___THREAD, don't assert bootstrap_map.l_tls_modid is zero. (_dl_start): Initialize bootstrap_map.l_tls_modid to 0 if USE___THREAD.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 9a21b8bc6f..718fa13b71 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -303,7 +303,6 @@ _dl_start_final (void *arg, struct dl_start_final_info *info)
GL(dl_rtld_map).l_tls_offset = info->l.l_tls_offset;
GL(dl_rtld_map).l_tls_modid = 1;
# else
- assert (info->l.l_tls_modid == 0);
# if NO_TLS_OFFSET != 0
GL(dl_rtld_map).l_tls_offset = NO_TLS_OFFSET;
# endif
@@ -389,6 +388,9 @@ _dl_start (void *arg)
++cnt)
bootstrap_map.l_info[cnt] = 0;
# endif
+# if USE___THREAD
+ bootstrap_map.l_tls_modid = 0;
+# endif
#endif
/* Figure out the run-time load address of the dynamic linker itself. */