summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-10-02 18:25:29 +0000
committerUlrich Drepper <drepper@redhat.com>2006-10-02 18:25:29 +0000
commit768027a456732285abffbddbce3127a29cdacf3e (patch)
tree0098787c3a9208876cd54811e0de0f606eb993ed /elf
parentd4ed75616838868f7b11f3cb5ee40561a47104ef (diff)
* elf/rtld.c (dl_main): Don't use prelinking if LD_DYNAMIC_WEAK is
used.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c3
1 files changed, 2 insertions, 1 deletions
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;