diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | elf/dl-load.c | 2 | ||||
| -rw-r--r-- | elf/dl-object.c | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c6444fb1ac..63a910b9aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-03-01 Ulrich Drepper <drepper@redhat.com> + + * elf/dl-load.c: Pretty printing. + + * elf/dl-object.c (_dl_new_object): Don't add the loader's scope + twice. + 2001-02-28 Ulrich Drepper <drepper@redhat.com> * sysdeps/alpha/dl-machine.h (elf_machine_rela): Don't handle @@ -5,7 +12,7 @@ * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. - * elf/dl-misc.c (_dl_debug_vdprintf): Fix type visible on 64-bit + * elf/dl-misc.c (_dl_debug_vdprintf): Fix typo visible on 64-bit machines. * sysdeps/unix/sysv/linux/powerpc/sysdep.h (C_TEXT): Define. diff --git a/elf/dl-load.c b/elf/dl-load.c index 2e4d2d8d98..6e4c972b00 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1105,7 +1105,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, /* If this object has DT_SYMBOLIC set modify now its scope. We don't have to do this for the main map. */ if (__builtin_expect (l->l_info[DT_SYMBOLIC] != NULL, 0) - && &l->l_searchlist != l->l_scope[0]) + && &l->l_searchlist != l->l_scope[0]) { /* Create an appropriate searchlist. It contains only this map. diff --git a/elf/dl-object.c b/elf/dl-object.c index eab8840985..983f5b8431 100644 --- a/elf/dl-object.c +++ b/elf/dl-object.c @@ -1,5 +1,5 @@ /* Storage management for the chain of loaded shared objects. - Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -73,9 +73,10 @@ _dl_new_object (char *realname, const char *libname, int type, { while (loader->l_loader != NULL) loader = loader->l_loader; - new->l_scope[idx] = &loader->l_searchlist; + if (idx == 0 || &loader->l_searchlist != new->l_scope[0]) + new->l_scope[idx] = &loader->l_searchlist; } - else + else if (idx == 0 || &new->l_searchlist != new->l_scope[0]) new->l_scope[idx] = &new->l_searchlist; new->l_local_scope[0] = &new->l_searchlist; |