1 files changed, 32 insertions, 26 deletions

diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 7c2eaf35c..4a0f840cb 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -1,5 +1,6 @@
 /*
  * Manuel Novoa III           Feb 2001
+ * Erik Anderseni             Mar 2002
  *
  * __uClibc_main is the routine to be called by all the arch-specific
  * versions of crt0.S in uClibc.
@@ -14,30 +15,25 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#if !defined HAVE_ELF || !defined __UCLIBC_HAS_MMU__
+# undef weak_function
+# undef weak_const_function
+# define weak_function
+# define weak_const_function
+# define __USE_WEAK_ALIASES
+#endif
 
 /*
  * Prototypes.
  */
-
 extern int main(int argc, char **argv, char **envp);
-
-void __uClibc_main(int argc, char **argv, char **envp)
-	 __attribute__ ((__noreturn__));
-
-
-
-#ifdef HAVE_ELF
-weak_alias(__environ, environ);
+extern int weak_function atexit(void (*function)(void));
+extern void weak_function _init(void);
+extern void weak_function _fini(void);
 extern void weak_function _stdio_init(void);
 extern void weak_function _stdio_term(void);
-extern int *weak_const_function __errno_location (void);
-extern int *weak_const_function __h_errno_location (void);
-#else
-extern void _stdio_init(void);
-extern void _stdio_term(void);
-extern int *__errno_location (void);
-extern int *__h_errno_location (void);
-#endif	
+extern int *weak_const_function __errno_location(void);
+extern int *weak_const_function __h_errno_location(void);
 
 /*
  * Declare the __environ global variable and create a weak alias environ.
@@ -46,13 +42,14 @@ extern int *__h_errno_location (void);
  */
 
 char **__environ = 0;
+weak_alias(__environ, environ);
 
 
 /*
  * Now for our main routine.
  */
-
-void __uClibc_main(int argc, char **argv, char **envp) 
+void __attribute__ ((__noreturn__)) 
+__uClibc_main(int argc, char **argv, char **envp) 
 {
 	/* 
 	 * Initialize the global variable __environ.
@@ -64,25 +61,31 @@ void __uClibc_main(int argc, char **argv, char **envp)
 	 * where the standard file descriptors are not opened.  We have
 	 * to do this only for statically linked applications since
 	 * otherwise the dynamic loader did the work already.  */
-	if (__builtin_expect (__libc_enable_secure, 0))
+	if (unlikely (__libc_enable_secure))
 	    __libc_check_standard_fds ();
 #endif
 	/*
 	 * Initialize stdio here.  In the static library case, this will
 	 * be bypassed if not needed because of the weak alias above.
 	 */
-	if (_stdio_init)
+	if (likely(_stdio_init))
 	  _stdio_init();
 
+	/* Arrange for dtors to run at exit.  */
+	atexit (&_fini);
+	/* Run all ctors now.  */
+	_init();
+
 	/*
 	 * Note: It is possible that any initialization done above could
 	 * have resulted in errno being set nonzero, so set it to 0 before
 	 * we call main.
 	 */
-	if (__errno_location)
+	if (likely(__errno_location))
 	    *(__errno_location()) = 0;
+
 	/* Set h_errno to 0 as well */
-	if (__h_errno_location)
+	if (likely(__h_errno_location))
 	    *(__h_errno_location()) = 0;
 
 	/*
@@ -91,7 +94,7 @@ void __uClibc_main(int argc, char **argv, char **envp)
 	exit(main(argc, argv, envp));
 }
 
-#ifndef HAVE_ELF
+#ifdef __USE_WEAK_ALIASES
 /*
  * Define an empty function and use it as a weak alias for the stdio
  * initialization routine.  That way we don't pull in all the stdio
@@ -102,11 +105,14 @@ void __uClibc_main(int argc, char **argv, char **envp)
  */
 
 weak_alias(__environ, environ);
-#if 0
 void __uClibc_empty_func(void)
 {
 }
+weak_alias(__uClibc_empty_func, atexit);
+weak_alias(__uClibc_empty_func, _init);
+weak_alias(__uClibc_empty_func, _fini);
+weak_alias(__uClibc_empty_func, __errno_location);
+weak_alias(__uClibc_empty_func, __h_errno_location);
 weak_alias(__uClibc_empty_func, _stdio_init);
 weak_alias(__uClibc_empty_func, _stdio_term);
-#endif
 #endif