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-deps.c | |
| parent | 3ee87ca7d4c813087eeee8b9fd04b7836244a54a (diff) | |
Updated to fedora-glibc-20041014T0548
Diffstat (limited to 'elf/dl-deps.c')
| -rw-r--r-- | elf/dl-deps.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c index 1a0fedf988..a1c16d7310 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -63,7 +63,8 @@ openaux (void *a) args->aux = _dl_map_object (args->map, args->name, 0, (args->map->l_type == lt_executable ? lt_library : args->map->l_type), - args->trace_mode, args->open_mode); + args->trace_mode, args->open_mode, + args->map->l_ns); } static ptrdiff_t @@ -510,7 +511,7 @@ _dl_map_object_deps (struct link_map *map, } if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK, 0) != 0 - && map == GL(dl_loaded)) + && map == GL(dl_ns)[LM_ID_BASE]._ns_loaded) { /* If we are to compute conflicts, we have to build local scope for each library, not just the ultimate loader. */ |