From c1d32f33b2f1d974ed6bb82fa6e6675a5793f525 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 1 Mar 2001 08:17:40 +0000 Subject: Update. 2001-03-01 Ulrich Drepper * elf/dl-load.c: Pretty printing. * elf/dl-object.c (_dl_new_object): Don't add the loader's scope twice. * elf/dl-misc.c (_dl_debug_vdprintf): Fix typo visible on 64-bit --- elf/dl-object.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'elf/dl-object.c') diff --git a/elf/dl-object.c b/elf/dl-object.c index eab8840..983f5b8 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; -- cgit v1.1