Update.

2002-12-19  Ulrich Drepper  <drepper@redhat.com>

	* 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 c6943ccb8e53fcf643bd93b8514b2af5d1f1607b..c790f5b15e7259f8ab9cc0ab97d59dcf2389d856 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19  Ulrich Drepper  <drepper@redhat.com>
+
+       * elf/rtld.c: Don't initialize _dl_dynamic_weak to 1 if
+       RTLD_CORRECT_DYNAMIC_WEAK is defined.
+
 2002-12-19  Jakub Jelinek  <jakub@redhat.com>
 
        * nscd/connections.c (nscd_run): Shut up warning.

diff --git a/elf/rtld.c b/elf/rtld.c
index a05034ee710459268b106b773466b75e1da74f84..9b08b96124a4614bb4a82bfd52be0422cc04a795 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -90,7 +90,7 @@ struct rtld_global _rtld_global =
     /* Get architecture specific initializer.  */
 #include <dl-procinfo.c>
     ._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 a5760c7f4eb12de18587ddfe52a2fd7aa77fa923..fb665383aa68de6e12cb3d17138ed1d74fc1cd81 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+       * 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  <jakub@redhat.com>
 
        * sysdeps/i386/useldt.h (FLOATING_STACKS, ARCH_STACK_MAX_SIZE): Only

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2ab96bce51c24a8febe283a668f42f18c4f68db6..86fd4ed80f8e4287be6b8b09db69ae95277d4f15 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/i386/dl-sysdep.h: Define
+       RTLD_CORRECT_DYNAMIC_WEAK.
+
 2002-12-19  Jakub Jelinek  <jakub@redhat.com>
 
        * 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 0481fce1851b433f72f6b0f714f7dbcd249dc9f4..8f541c5140e645f296df4ce28f252692890ef718 100644 (file)
--- 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