2 files changed, 33 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/profil-counter.h b/sysdeps/unix/sysv/linux/i386/profil-counter.h
index 615371ac35..a24ea19654 100644
--- a/sysdeps/unix/sysv/linux/i386/profil-counter.h
+++ b/sysdeps/unix/sysv/linux/i386/profil-counter.h
@@ -1,5 +1,5 @@
 /* Low-level statistical profiling support function.  Linux/i386 version.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 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
@@ -19,7 +19,7 @@
 
 #include <signal.h>
 
-void
+static void
 profil_counter (int signo, struct sigcontext sc)
 {
   profil_count ((void *) sc.eip);
diff --git a/sysdeps/unix/sysv/linux/libc-start.c b/sysdeps/unix/sysv/linux/libc-start.c
index f142195fbc..e9d21a638b 100644
--- a/sysdeps/unix/sysv/linux/libc-start.c
+++ b/sysdeps/unix/sysv/linux/libc-start.c
@@ -17,15 +17,44 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <link.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+extern void __libc_init_first (void);
 
 int
 __libc_start_main (int (*main) (int, char **, char **), int argc,
-		   char **argv, char **envp)
+		   char **argv, void (*init) (void), void (*fini) (void),
+		   void (*rtld_fini) (void))
 {
+  /* Register the destructor of the dynamic linker if there is any.  */
+  if (rtld_fini != NULL)
+    atexit (rtld_fini);
+
+  /* Call the initializer of the libc.  */
+#ifdef PIC
+  if (_dl_debug_impcalls)
+    _dl_debug_message ("\tinitialize libc\n\n", NULL);
+#endif
+  __libc_init_first ();
+
+  /* Set the global _environ variable correctly.  */
+  __environ = &argv[argc + 1];
+
+  /* Call the initializer of the program.  */
+#ifdef PIC
+  if (_dl_debug_impcalls)
+    _dl_debug_message ("\tinitialize program: ", argv[0], "\n\n", NULL);
+#endif
+  (*init) ();
+
+  /* Register the destructor of the program.  */
+  atexit (fini);
+
 #ifdef PIC
   if (_dl_debug_impcalls)
     _dl_debug_message ("\ttransferring control: ", argv[0], "\n\n", NULL);
 #endif
 
-  return (*main) (argc, argv, envp);
+  exit ((*main) (argc, argv, __environ));
 }