From 154619b591282fc664dbedaee4fab8b57206c9ab Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 29 Sep 2006 17:07:11 +0000 Subject: [BZ #3273] 2006-09-29 Ulrich Drepper [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 * 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. --- elf/rtld.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'elf/rtld.c') 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. */ -- cgit v1.2.3