From 5bbcba0db58cef39ec4b582cd665ccb019dc6763 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 24 Oct 2002 19:14:59 +0000 Subject: * elf/dl-misc.c: Include . (_dl_debug_vdprintf): Only take dl_load_lock if not _dl_starting_up. * sysdeps/generic/ldsodefs.h (_dl_starting_up): Declare it here. * sysdeps/unix/sysv/linux/init-first.c: Not here. * sysdeps/powerpc/elf/libc-start.c: Or here. * sysdeps/unix/sysv/aix/libc-start.c: Or here. * sysdeps/unix/sysv/aix/start-libc.c: Or here. * sysdeps/unix/sysv/aix/init-first.c: Or here. * sysdeps/generic/libc-start.c: Or here. * sysdeps/unix/sysv/linux/init-first.c (init): Protect _dl_starting_up access with [! SHARED]. * sysdeps/unix/sysv/aix/init-first.c (init): Likewise. --- elf/dl-misc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'elf/dl-misc.c') diff --git a/elf/dl-misc.c b/elf/dl-misc.c index f80472485d..0fbfcde004 100644 --- a/elf/dl-misc.c +++ b/elf/dl-misc.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -81,7 +82,7 @@ _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot) } -/* Bare-bone printf implementation. This function only knows about +/* Bare-bones printf implementation. This function only knows about the formats and flags needed and can handle only up to 64 stripes in the output. */ static void @@ -250,10 +251,17 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg) INTERNAL_SYSCALL (writev, 3, fd, iov, niov); #elif RTLD_PRIVATE_ERRNO /* We have to take this lock just to be sure we don't clobber the private - errno when it's being used by another thread that cares about it. */ - __libc_lock_lock_recursive (GL(dl_load_lock)); - __writev (fd, iov, niov); - __libc_lock_unlock_recursive (GL(dl_load_lock)); + errno when it's being used by another thread that cares about it. + Yet we must be sure not to try calling the lock functions before + the thread library is fully initialized. */ + if (__builtin_expect (INTUSE (_dl_starting_up), 0)) + __writev (fd, iov, niov); + else + { + __libc_lock_lock_recursive (GL(dl_load_lock)); + __writev (fd, iov, niov); + __libc_lock_unlock_recursive (GL(dl_load_lock)); + } #else __writev (fd, iov, niov); #endif -- cgit v1.2.3