From: Ulrich Drepper Date: Thu, 19 Dec 2002 09:57:54 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/glibc-2_3_2~492 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3325198e71fe8e600f585ef3a38c3b5240d440db;p=thirdparty%2Fglibc.git Update. 2002-12-19 Ulrich Drepper * elf/rtld.c: Don't initialize _dl_dynamic_weak to 1 if RTLD_CORRECT_DYNAMIC_WEAK is defined. --- diff --git a/ChangeLog b/ChangeLog index c6943ccb8e5..c790f5b15e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-12-19 Ulrich Drepper + + * elf/rtld.c: Don't initialize _dl_dynamic_weak to 1 if + RTLD_CORRECT_DYNAMIC_WEAK is defined. + 2002-12-19 Jakub Jelinek * nscd/connections.c (nscd_run): Shut up warning. diff --git a/elf/rtld.c b/elf/rtld.c index a05034ee710..9b08b96124a 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -90,7 +90,7 @@ struct rtld_global _rtld_global = /* Get architecture specific initializer. */ #include ._dl_debug_fd = STDERR_FILENO, -#if 1 +#ifndef RTLD_CORRECT_DYNAMIC_WEAK /* XXX I know about at least one case where we depend on the old weak behavior (it has to do with librt). Until we get DSO groups implemented we have to make this the default. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index a5760c7f4eb..fb665383aa6 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2002-12-19 Jakub Jelinek + + * forward.c (pthread_attr_init_2_0, pthread_attr_init_2_1): + Use return 0 as 6th argument to FORWARD4. + 2002-12-18 Jakub Jelinek * sysdeps/i386/useldt.h (FLOATING_STACKS, ARCH_STACK_MAX_SIZE): Only diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 2ab96bce51c..86fd4ed80f8 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2002-12-19 Ulrich Drepper + + * sysdeps/unix/sysv/linux/i386/dl-sysdep.h: Define + RTLD_CORRECT_DYNAMIC_WEAK. + 2002-12-19 Jakub Jelinek * forward.c (pthread_attr_init_2_0, pthread_attr_init_2_1): diff --git a/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h index 0481fce1851..8f541c5140e 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h @@ -30,6 +30,14 @@ #define RTLD_PRIVATE_ERRNO 1 +/* This configuration has in libc.so cancellable functions and other + functions which have to behave differently if the application uses + threads. It is not necessary that the thread library's definitions + are used. Therefore we can finally enabled the correct handling + of weak definitions in ld.so. See rtld.c. */ + +#define RTLD_CORRECT_DYNAMIC_WEAK 1 + /* Traditionally system calls have been made using int $0x80. A second method was introduced which, if possible, will use the