diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-10-02 18:25:29 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-10-02 18:25:29 +0000 |
| commit | 768027a456732285abffbddbce3127a29cdacf3e (patch) | |
| tree | 0098787c3a9208876cd54811e0de0f606eb993ed | |
| parent | d4ed75616838868f7b11f3cb5ee40561a47104ef (diff) | |
* elf/rtld.c (dl_main): Don't use prelinking if LD_DYNAMIC_WEAK is
used.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | README | 7 | ||||
| -rw-r--r-- | README.template | 7 | ||||
| -rw-r--r-- | elf/rtld.c | 3 |
4 files changed, 7 insertions, 15 deletions
@@ -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 @@ -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 5e22a270b5..02ef86c594 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 718fa13b71..7746377f37 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; |