From 9869e6ec913e268748f510ab6ec64b8fd62531bc Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 14 Oct 2004 05:57:55 +0000 Subject: Updated to fedora-glibc-20041014T0548 --- elf/dl-conflict.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'elf/dl-conflict.c') diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index 8546d365c9..4ced40f75e 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -54,8 +54,10 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, (map) = resolve_conflict_map; \ } while (0) + /* Prelinking makes no sense for anything but the main namespace. */ + assert (l->l_ns == LM_ID_BASE); struct link_map *resolve_conflict_map __attribute__ ((__unused__)) - = GL(dl_loaded); + = GL(dl_ns)[LM_ID_BASE]._ns_loaded; #include "dynamic-link.h" -- cgit 1.4.1