* elf/rtld.c (dl_main): Don't use prelinking if LD_DYNAMIC_WEAK is

	used.

4 files changed, 7 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index eeb46e3..23c8f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/rtld.c (dl_main): Don't use prelinking if LD_DYNAMIC_WEAK is
+	used.
+
 2006-10-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* nscd/mem.c (mempool_alloc): Round array size to 16 bytes
diff --git a/README b/README
index 2b9495d..97b3a61 100644
--- a/README
+++ b/README
@@ -10,13 +10,6 @@ In GNU/Linux systems, the C library works with the Linux kernel to
 implement the operating system behavior seen by user applications.
 In GNU/Hurd systems, it works with a microkernel and Hurd servers.
 
-Version 2.4 is the first release after a long period of development, and
-introduces changes to the API and a new ABI for all configurations.  It
-has been tested and deployed in new production systems, but should still
-be considered somewhat experimental.  The stable 2.3 release series
-continues to be maintained, and implements a widely-deployed ABI.
-Version 2.3.6 is available, and we will release 2.3.7 with more bug fixes.
-
 The GNU C Library implements much of the POSIX.1 functionality in the
 GNU/Hurd system, using configurations i[34567]86-*-gnu.
 
diff --git a/README.template b/README.template
index 5e22a27..02ef86c 100644
--- a/README.template
+++ b/README.template
@@ -10,13 +10,6 @@ In GNU/Linux systems, the C library works with the Linux kernel to
 implement the operating system behavior seen by user applications.
 In GNU/Hurd systems, it works with a microkernel and Hurd servers.
 
-Version 2.4 is the first release after a long period of development, and
-introduces changes to the API and a new ABI for all configurations.  It
-has been tested and deployed in new production systems, but should still
-be considered somewhat experimental.  The stable 2.3 release series
-continues to be maintained, and implements a widely-deployed ABI.
-Version 2.3.6 is available, and we will release 2.3.7 with more bug fixes.
-
 The GNU C Library implements much of the POSIX.1 functionality in the
 GNU/Hurd system, using configurations i[34567]86-*-gnu.
 
diff --git a/elf/rtld.c b/elf/rtld.c
index 718fa13..7746377 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2087,7 +2087,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
     }
 
   if (main_map->l_info[ADDRIDX (DT_GNU_LIBLIST)]
-      && ! __builtin_expect (GLRO(dl_profile) != NULL, 0))
+      && ! __builtin_expect (GLRO(dl_profile) != NULL, 0)
+      && ! __builtin_expect (GLRO(dl_dynamic_weak), 0))
     {
       ElfW(Lib) *liblist, *liblistend;
       struct link_map **r_list, **r_listend, *l;