diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-09-29 20:49:06 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-09-29 20:49:06 +0000 |
| commit | af47bc499af76c844b28d9ca912ed81f2a353708 (patch) | |
| tree | 31ca20685bb989c345173126f498d79faa82a8d9 /elf | |
| parent | 5ed9cc7c21189bab600d08763133a2b8fe90896d (diff) | |
| download | glibc-af47bc499af76c844b28d9ca912ed81f2a353708.tar.gz glibc-af47bc499af76c844b28d9ca912ed81f2a353708.tar.xz glibc-af47bc499af76c844b28d9ca912ed81f2a353708.zip | |
Updated to fedora-glibc-20060929T2037 cvs/fedora-glibc-2_5-1
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/rtld.c | 4 |
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. */ |