Update.

2000-03-30  Ulrich Drepper  <drepper@redhat.com>

	Implement dynamic determination of constructor/destructor order in
	the dynamic linker.
	* elf/Versions [ld.so] (GLIBC_2.0): Remove _dl_init_next.
	(GLIBC_2.2): Add _dl_init.
	* elf/dl-close.c: Also call all destructors in FINI_ARRAY.
	r_duplist is not anymore allocated separately.  l_initfini is and
	therefore free it if necessary.
	* elf/dl-deps.c: If a searchlist has to be allocated, put all in one
	malloc block.  Otherwise allocate l_initfini list only.
	Put dependencies for the object in l_initfini list.
	Sort dependencies for the object to be loaded topologically.
	* elf/dl-fini.c: Before running the destructors sort the topologically.
	* elf/dl-init.c (_dl_init): Renamed from _dl_init_next.  Rewrite to
	call constructors instead of iterating over the pointers.  Get list of
	objects for which to run constructors from l_initfini element. Accept
	argc, argv, and env as parameters and pass them to the constructors.
	* elf/ld-load.c (_dl_map_object_from_fd): Initialize l_ldnum member
	with size of dynamic section.
	* elf/dl-open.c (dl_open_worker): Only call _dl_init instead of
	_dl_init_next and calling constructors ourself.
	* elf/dl-preinit.c (_dl_preinit): Renamed from _dl_preinit_next.
	Take argc, argv, and env as parameters and pass them to the
	constructors.  Rewrite to call all constructors and not iterate over
	the pointers.
	* elf/dynamic-link.h: Don't relocate DT_FINI_ARRAY entry.  Don't
	precompute l_initcount and l_preinitcount.
	* elf/link.h (struct link_map): Add l_ldnum member.
	Make l_phdr_allocated part of the bitfield.  Remove l_runcount,
	l_initcount, and l_preinitcount.  Add l_initfini.
	* sysdeps/generic/ldsodefs.h: Replace _dl_init_next prototype with
	one for _dl_init.
	* sysdeps/i386/dl-machine (RTLD_START): Rewrite to match new init
	function interface.
	* sysdeps/unix/sysv/linux/init-first.h: Removed.
	* sysdeps/unix/sysv/linux/Dist: Delete file here as well.
	* sysdeps/unix/sysv/linux/init-first.c [PIC]: Don't use
	SYSDEP_CALL_INIT.  Make _init a strong alias of init.  The calling
	conventions now match.

	* sysdeps/generic/libc-start.c: Calling __libc_init_first has no
	effect for shared objects.  Don't emit message and call only for
	static library.

6 files changed, 36 insertions, 103 deletions

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index bcc74b3ab2..bc4ece2a7e 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -354,11 +354,10 @@ extern int _dl_check_all_versions (struct link_map *map, int verbose)
 extern int _dl_check_map_versions (struct link_map *map, int verbose)
      internal_function;
 
-/* Return the address of the next initializer function for SCOPE or one of
-   its dependencies that has not yet been run.  When there are no more
-   initializers to be run, this returns zero.  The functions are returned
-   in the order they should be called.  */
-extern ElfW(Addr) _dl_init_next (struct r_scope_elem *scope) internal_function;
+/* Initialize the object in SCOPE by calling the constructors with
+   ARGC, ARGV, and ENV as the parameters.  */
+extern void _dl_init (struct link_map *main_map, int argc, char **argv,
+		      char **env) internal_function;
 
 /* Call the finalizer functions of all shared objects whose
    initializer functions have completed.  */
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index bcb3cf3f2d..e3960ca818 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -63,12 +63,12 @@ __libc_start_main (int (*main) (int, char **, char **), int argc,
   if (rtld_fini != NULL)
     atexit (rtld_fini);
 
-  /* Call the initializer of the libc.  */
-#ifdef PIC
-  if (_dl_debug_impcalls)
-    _dl_debug_message (1, "\ninitialize libc\n\n", NULL);
-#endif
+  /* Call the initializer of the libc.  This is only needed here if we
+     are compiling for the static library in which case we haven't
+     run the constructors in `_dl_start_user'.  */
+#ifndef PIC
   __libc_init_first (argc, argv, __environ);
+#endif
 
   /* Register the destructor of the program, if any.  */
   if (fini)
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 351b82af32..1256fbcdc0 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  i386 version.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 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
@@ -217,47 +217,33 @@ _dl_start_user:\n\
 	movl _dl_skip_args@GOT(%ebx), %eax\n\
 	movl (%eax), %eax\n\
 	# Pop the original argument count.\n\
-	popl %ecx\n\
+	popl %esi\n\
 	# Subtract _dl_skip_args from it.\n\
-	subl %eax, %ecx\n\
+	subl %eax, %esi\n\
 	# Adjust the stack pointer to skip _dl_skip_args words.\n\
 	leal (%esp,%eax,4), %esp\n\
-	# Push back the modified argument count.\n\
-	pushl %ecx\n\
-	# Push the searchlist of the main object as argument in\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\
-	call _dl_init_next@PLT\n\
-	# Check for zero return, when out of initializers.\n\
-	testl %eax, %eax\n\
-	jz 1f\n\
-	# Call the shared object initializer function.\n\
-	# NOTE: We depend only on the registers (%ebx, %esi and %edi)\n\
-	# and the return address pushed by this call;\n\
-	# the initializer is called with the stack just\n\
-	# as it appears on entry, and it is free to move\n\
-	# the stack around, as long as it winds up jumping to\n\
-	# the return address on the top of the stack.\n\
-	call *%eax\n\
-	# Loop to call _dl_init_next for the next initializer.\n\
-	jmp 0b\n\
-1:	# Clear the startup flag.\n\
+	# Move the argv pointer in a register.\n\
+	leal 4(%esp,%esi,4), %edx\n\
+	movl %esp, %ecx\n\
+	pushl %edx\n\
+	movl %esi, %edx\n\
+	# Get the searchlist of the main object as argument for\n\
+	# _dl_preinit and _dl_init calls below.\n\
+	movl _dl_loaded@GOT(%ebx), %ebp\n\
+	movl (%ebp), %eax\n\
+	# Call the function to run the pre-initializers.\n\
+	call _dl_preinit@PLT\n\
+	# Load the parameters again.\n\
+	leal 4(%esp,%esi,4), %edx\n\
+	movl %esp, %ecx\n\
+	pushl %edx\n\
+	movl %esi, %edx\n\
+	movl (%ebp), %eax\n\
+	# Call the function to run the initializers.\n\
+	call _dl_init@PLT\n\
+	# Push argc back on the stack.\n\
+	push %esi\n\
+	# Clear the startup flag.\n\
 	movl _dl_starting_up@GOT(%ebx), %eax\n\
 	movl $0, (%eax)\n\
 	# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 87d9044015..06754f8a16 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -3,7 +3,6 @@ cmsg_nxthdr.c
 errlist.h
 getdirentries.c
 getdirentries64.c
-init-first.h
 ipc_priv.h
 kernel-features.h
 kernel_sigaction.h
diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c
index 9a8f3c5fb2..a04234864d 100644
--- a/sysdeps/unix/sysv/linux/init-first.c
+++ b/sysdeps/unix/sysv/linux/init-first.c
@@ -1,5 +1,5 @@
 /* Initialization code run first thing by the ELF startup code.  Linux version.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 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
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <sysdep.h>
 #include <fpu_control.h>
-#include <init-first.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
@@ -156,7 +155,7 @@ init (int argc, char **argv, char **envp)
 
 #ifdef PIC
 
-SYSDEP_CALL_INIT(_init, init);
+strong_alias (init, _init);
 
 void
 __libc_init_first (void)
diff --git a/sysdeps/unix/sysv/linux/init-first.h b/sysdeps/unix/sysv/linux/init-first.h
deleted file mode 100644
index aaf8a4f4dc..0000000000
--- a/sysdeps/unix/sysv/linux/init-first.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Prepare arguments for library initialization function.
-   Copyright (C) 1997, 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.  */
-
-/* The job of this fragment it to find argc and friends for INIT.
-   This is done in one of two ways: either in the stack context
-   of program start, or having dlopen pass them in.  */
-
-#define SYSDEP_CALL_INIT(NAME, INIT)					      \
-void NAME (void *arg)							      \
-{									      \
-  int argc;								      \
-  char **argv, **envp;							      \
-  /* The next variable is only here to work around a bug in gcc <= 2.7.2.2.   \
-     If the address would be taken inside the expression the optimizer	      \
-     would try to be too smart and throws it away.  Grrr.  */		      \
-  int *dummy_addr = &_dl_starting_up;					      \
-									      \
-  __libc_multiple_libcs = dummy_addr && !_dl_starting_up;		      \
-									      \
-  if (!__libc_multiple_libcs)						      \
-    {									      \
-      argc = (int) (long int) arg;					      \
-      argv = (char **) &arg + 1;					      \
-      envp = &argv[argc+1];						      \
-    }									      \
-  else									      \
-    {									      \
-      argc = (int) (long int) arg;					      \
-      argv = ((char ***) &arg)[1];					      \
-      envp = ((char ***) &arg)[2];					      \
-    }									      \
-									      \
-  INIT (argc, argv, envp);						      \
-}