Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so Don't actually bother maintaining _rtld_li...



details:   https://anonhg.NetBSD.org/src/rev/e162f743f783
branches:  trunk
changeset: 537645:e162f743f783
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Fri Oct 04 04:01:13 2002 +0000

description:
Don't actually bother maintaining _rtld_list_main and _rtld_list_global in
ldd.

diffstat:

 libexec/ld.elf_so/load.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 5b54d6568460 -r e162f743f783 libexec/ld.elf_so/load.c
--- a/libexec/ld.elf_so/load.c  Fri Oct 04 03:59:40 2002 +0000
+++ b/libexec/ld.elf_so/load.c  Fri Oct 04 04:01:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: load.c,v 1.21 2002/10/04 03:59:40 mycroft Exp $         */
+/*     $NetBSD: load.c,v 1.22 2002/10/04 04:01:13 mycroft Exp $         */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -57,10 +57,12 @@
 static bool _rtld_load_by_name __P((const char *, Obj_Entry *, Needed_Entry **,
     int));
 
+#ifdef RTLD_LOADER
 Objlist _rtld_list_main =      /* Objects loaded at program startup */
   SIMPLEQ_HEAD_INITIALIZER(_rtld_list_main);
 Objlist _rtld_list_global =    /* Objects dlopened with RTLD_GLOBAL */
   SIMPLEQ_HEAD_INITIALIZER(_rtld_list_global);
+#endif
 
 void
 _rtld_objlist_add(list, obj)
@@ -155,6 +157,7 @@
                free(filepath);
 
        ++obj->refcount;
+#ifdef RTLD_LOADER
        if (mode & RTLD_MAIN && !obj->mainref) {
                obj->mainref = 1;
                rdbg(("adding %p (%s) to _rtld_list_main", obj, obj->path));
@@ -165,6 +168,7 @@
                rdbg(("adding %p (%s) to _rtld_list_global", obj, obj->path));
                _rtld_objlist_add(&_rtld_list_global, obj);
        }
+#endif
        return obj;
 }
 



Home | Main Index | Thread Index | Old Index