Update.

	* 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.

1 files changed, 4 insertions, 0 deletions

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 */