Update.

	* elf/Makefile (dl-routines): Remove preinit.
	* elf/Versions: Remove _dl_preinit.
	* elf/dl-preinit.c: Removed.  Move content into...
	* elf/dl-init.c: ...here.

4 files changed, 21 insertions, 57 deletions

diff --git a/elf/Makefile b/elf/Makefile
index 8d4a3da..11bbf99 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 preinit)
+				  version profile)
 # 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 ca9b697..9cb6245 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -49,6 +49,6 @@ ld.so {
     _dl_dst_count; _dl_dst_substitute;
   }
   GLIBC_2.2 {
-    _dl_preinit_next; _dl_init;
+    _dl_init;
   }
 }
diff --git a/elf/dl-init.c b/elf/dl-init.c
index c20e87a..2c1c24c 100644
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -29,9 +29,28 @@ void
 internal_function
 _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
 {
+  ElfW(Dyn) *preinit_array = main_map->l_info[DT_PREINIT_ARRAYSZ];
   struct r_debug *r;
   unsigned int i;
 
+  /* Don't do anything if there is no preinit array.  */
+  if (preinit_array != NULL
+      && (i = preinit_array->d_un.d_val / sizeof (ElfW(Addr))) > 0)
+    {
+      ElfW(Addr) *addrs;
+      unsigned int cnt;
+
+      if (_dl_debug_impcalls)
+	_dl_debug_message (1, "\ncalling preinit: ",
+			   main_map->l_name[0]
+			   ? main_map->l_name : _dl_argv[0], "\n\n", NULL);
+
+      addrs = (ElfW(Addr) *) (main_map->l_info[DT_PREINIT_ARRAY]->d_un.d_ptr
+			      + main_map->l_addr);
+      for (cnt = 0; cnt < i; ++cnt)
+	((init_t) addrs[cnt]) (argc, argv, env);
+    }
+
   /* Notify the debugger we have added some objects.  We need to call
      _dl_debug_initialize in a static program in case dynamic linking has
      not been used before.  */
diff --git a/elf/dl-preinit.c b/elf/dl-preinit.c
deleted file mode 100644
index fa8ce7e..0000000
--- a/elf/dl-preinit.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Return the next shared object pre-initializer function not yet run.
-   Copyright (C) 1995,96,98,99,2000 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 <ldsodefs.h>
-
-
-/* Type of the initializer.  */
-typedef void (*init_t) (int, char **, char **);
-
-
-/* Run initializers for MAP and its dependencies, in inverse dependency
-   order (that is, leaf nodes first).  */
-
-void
-internal_function
-_dl_preinit (struct link_map *main_map, int argc, char **argv, char **env)
-{
-  /* Don't do anything if there is no preinit array.  */
-  ElfW(Dyn) *preinit_array = main_map->l_info[DT_PREINIT_ARRAYSZ];
-  unsigned int max;
-
-  if (preinit_array != NULL
-      && (max = preinit_array->d_un.d_val / sizeof (ElfW(Addr))) > 0)
-    {
-      ElfW(Addr) *addrs;
-      unsigned int cnt;
-
-      if (_dl_debug_impcalls)
-	_dl_debug_message (1, "\ncalling preinit: ",
-			   main_map->l_name[0]
-			   ? main_map->l_name : _dl_argv[0], "\n\n", NULL);
-
-      addrs = (ElfW(Addr) *) (main_map->l_info[DT_PREINIT_ARRAY]->d_un.d_ptr
-			      + main_map->l_addr);
-      for (cnt = 0; cnt < max; ++cnt)
-	((init_t) addrs[cnt]) (argc, argv, env);
-    }
-}