diff options
author | Jakub Jelinek <jakub@redhat.com> | 2004-10-14 05:57:55 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-14 05:57:55 +0000 |
commit | 9869e6ec913e268748f510ab6ec64b8fd62531bc (patch) | |
tree | f3f8b9c049c73755d183cc1c1affd34ee8f9772b /elf/dl-conflict.c | |
parent | 3ee87ca7d4c813087eeee8b9fd04b7836244a54a (diff) |
Updated to fedora-glibc-20041014T0548
Diffstat (limited to 'elf/dl-conflict.c')
-rw-r--r-- | elf/dl-conflict.c | 4 |
1 files changed, 3 insertions, 1 deletions
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" |