[BZ #77]

[thirdparty/glibc.git] / elf / dl-conflict.c

diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c
index 8546d365c9f50f8a9985b6d46032058e925cde03..4ced40f75ecea77b334a75a83ea049875cc47166 100644 (file)
--- 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"