aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--elf/Makefile2
-rw-r--r--elf/Versions3
-rw-r--r--elf/dl-preinit.c49
-rw-r--r--elf/dynamic-link.h4
-rw-r--r--elf/link.h4
-rw-r--r--sysdeps/i386/dl-machine.h12
7 files changed, 80 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a124aa..cf81692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
1999-07-24 Ulrich Drepper <drepper@cygnus.com>
+ * elf/Makefile (dl-routines): Add preinit.
+ * elf/Versions [ld.so] (GLIBC_2.2): Export _dl_preinit_next.
+ * elf/link.h (struct link_map): Add new field l_preinitcount.
+ * elf/dl-preinit.c: New file.
+ * elf/dynamic-link.h: Initialize l_preinitcount.
+ * sysdeps/i386/dl-machine.h (RTLD_START): Call pre-init functions.
+
* elf/dl-fini.c: Handle DT_FINI_ARRAY.
* elf/link.h (struct link_map): Remove l_init_running. Add l_runcount
and l_initcount.
diff --git a/elf/Makefile b/elf/Makefile
index 225b56f..5cecc2b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -28,7 +28,7 @@ routines = $(dl-routines) dl-open dl-close dl-symbol dl-support \
# profiled libraries.
dl-routines = $(addprefix dl-,load cache lookup object reloc deps \
runtime error init fini debug misc \
- version profile)
+ version profile preinit)
# But they are absent from the shared libc, because that code is in ld.so.
elide-routines.os = $(dl-routines) dl-support enbl-secure
diff --git a/elf/Versions b/elf/Versions
index c45ba04..b3d9d43 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -48,4 +48,7 @@ ld.so {
# functions used in other libraries
_dl_dst_count; _dl_dst_substitute;
}
+ GLIBC_2.2 {
+ _dl_preinit_next;
+ }
}
diff --git a/elf/dl-preinit.c b/elf/dl-preinit.c
new file mode 100644
index 0000000..67c5edb
--- /dev/null
+++ b/elf/dl-preinit.c
@@ -0,0 +1,49 @@
+/* Return the next shared object pre-initializer function not yet run.
+ Copyright (C) 1995, 1996, 1998, 1999 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <stddef.h>
+#include <elf/ldsodefs.h>
+
+
+/* Run initializers for MAP and its dependencies, in inverse dependency
+ order (that is, leaf nodes first). */
+
+ElfW(Addr)
+internal_function
+_dl_preinit_next (struct r_scope_elem *searchlist)
+{
+ struct link_map *l = searchlist->r_list[0];
+ ElfW(Addr) *array;
+
+ if (l->l_runcount >= l->l_preinitcount)
+ {
+ /* That were all of the constructors. */
+ l->l_runcount = 0;
+ return 0;
+ }
+
+ /* Print a debug message if wanted. */
+ if (_dl_debug_impcalls && l->l_runcount == 0)
+ _dl_debug_message (1, "\ncalling preinit: ",
+ l->l_name[0] ? l->l_name : _dl_argv[0],
+ "\n\n", NULL);
+
+ array = (ElfW(Addr) *) l->l_info[DT_PREINIT_ARRAY]->d_un.d_ptr;
+ return l->l_addr + array[l->l_runcount++];
+}
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index bdd297e..7edac41 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -118,6 +118,10 @@ elf_get_dynamic_info (struct link_map *l)
? (info[DT_INIT_ARRAYSZ]->d_un.d_val
/ sizeof (ElfW(Addr)))
: 0);
+ l->l_preinitcount = (info[DT_PREINIT_ARRAY]
+ ? (info[DT_PREINIT_ARRAYSZ]->d_un.d_val
+ / sizeof (ElfW(Addr)))
+ : 0);
if (info[DT_RUNPATH] != NULL)
/* If both RUNPATH and RPATH are given, the latter is ignored. */
info[DT_RPATH] = NULL;
diff --git a/elf/link.h b/elf/link.h
index cda739d..d3a54fc 100644
--- a/elf/link.h
+++ b/elf/link.h
@@ -211,6 +211,10 @@ struct link_map
/* Collected information about own RUNPATH directories. */
struct r_search_path_elem **l_runpath_dirs;
+
+ /* Number of pre-constructors. We compute this during loading to avoid
+ duplication of this during the possibly many calls to _dl_init_next. */
+ unsigned int l_preinitcount;
};
#endif /* link.h */
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 0377157..2a14d73 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -229,6 +229,18 @@ _dl_start_user:\n\
# _dl_init_next call below.\n\
movl _dl_main_searchlist@GOT(%ebx), %eax\n\
movl (%eax), %esi\n\
+ # First run the pre-initializers.\n\
+0: movl %esi,%eax\n\
+ # Call _dl_init_next to return the address of an initializer\n\
+ # function to run.\n\
+ call _dl_preinit_next@PLT\n\
+ # Check for zero return, when out of initializers.\n\
+ testl %eax, %eax\n\
+ jz 0f\n\
+ # Call the pre-initilizer.\n\
+ call *%eax\n\
+ # Loop to call _dl_preinit_next for the next initializer.\n\
+ jmp 0b\n\
0: movl %esi,%eax\n\
# Call _dl_init_next to return the address of an initializer\n\
# function to run.\n\