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 Move the definition of _rtld_list_main so ...



details:   https://anonhg.NetBSD.org/src/rev/5b54d6568460
branches:  trunk
changeset: 537644:5b54d6568460
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Fri Oct 04 03:59:40 2002 +0000

description:
Move the definition of _rtld_list_main so ldd builds again.

diffstat:

 libexec/ld.elf_so/load.c |  4 +++-
 libexec/ld.elf_so/rtld.c |  5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 036c047fcf0f -r 5b54d6568460 libexec/ld.elf_so/load.c
--- a/libexec/ld.elf_so/load.c  Fri Oct 04 03:43:06 2002 +0000
+++ b/libexec/ld.elf_so/load.c  Fri Oct 04 03:59:40 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: load.c,v 1.20 2002/10/03 20:35:19 mycroft Exp $         */
+/*     $NetBSD: load.c,v 1.21 2002/10/04 03:59:40 mycroft Exp $         */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -57,6 +57,8 @@
 static bool _rtld_load_by_name __P((const char *, Obj_Entry *, Needed_Entry **,
     int));
 
+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);
 
diff -r 036c047fcf0f -r 5b54d6568460 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Fri Oct 04 03:43:06 2002 +0000
+++ b/libexec/ld.elf_so/rtld.c  Fri Oct 04 03:59:40 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.84 2002/10/03 20:35:20 mycroft Exp $         */
+/*     $NetBSD: rtld.c,v 1.85 2002/10/04 03:59:41 mycroft Exp $         */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -83,9 +83,6 @@
 Elf_Sym         _rtld_sym_zero;        /* For resolving undefined weak refs. */
 int            _rtld_pagesz;   /* Page size, as provided by kernel */
 
-Objlist _rtld_list_main =      /* Objects loaded at program startup */
-  SIMPLEQ_HEAD_INITIALIZER(_rtld_list_main);
-
 Search_Path    *_rtld_default_paths;
 Search_Path    *_rtld_paths;
 



Home | Main Index | Thread Index | Old Index