Move handling of .init_array to separate file

This allows applications to override __main() as before, when that code
is not needed

Author: th-otto

configvars

@@ -143,7 +143,7 @@ LDFLAGS=
 DEFS=
 
 # Define this to the warning level you want.
-WARN=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wold-style-declaration -Wold-style-definition
+WARN=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wold-style-declaration -Wold-style-definition -Wdeclaration-after-statement
 
 # If your system lacks a BSD compatible install you should set this
 # variable to "$(top_srcdir}/install-sh".

mintlib/SRCFILES

@@ -113,6 +113,7 @@ SRCFILES = \
 	wctype.c \
 	wcwidth.c \
 	wcscoll.c \
+	__main.c \
 	\
 	nf_debug.c \
 	nf_name.c \

mintlib/__main.c

@@ -0,0 +1,60 @@
+#include <stdlib.h>
+#include "lib.h"
+
+#ifdef __GCC_HAVE_INITFINI_ARRAY_SUPPORT
+
+/*
+ * Support for the init/fini initialization mechanism.
+ * Inspired from glibc's csu/libc-start.c.
+ * https://sourceware.org/git/?p=glibc.git;f=csu/libc-start.c;hb=refs/heads/master
+ */
+
+/* These magic symbols are provided by the linker.  */
+extern void (*__preinit_array_start [])(int, char **, char **);
+extern void (*__preinit_array_end [])(int, char **, char **);
+extern void (*__init_array_start [])(int, char **, char **);
+extern void (*__init_array_end [])(int, char **, char **);
+extern void (*__fini_array_start [])(void);
+extern void (*__fini_array_end [])(void);
+
+/* Call global initializers/constructors.  */
+static void
+call_init(int argc, char **argv, char **envp)
+{
+	size_t size;
+	size_t i;
+
+	/* Preinitializers come from the .preinit_array sections.  */
+	size = __preinit_array_end - __preinit_array_start;
+	for (i = 0; i < size; i++)
+		(*__preinit_array_start [i])(argc, argv, envp);
+
+	/* Modern systems don't require the .init section.  */
+	/*_init();*/
+
+	/* Initializers come from the .init_array sections.  */
+	size = __init_array_end - __init_array_start;
+	for (i = 0; i < size; i++)
+		(*__init_array_start [i])(argc, argv, envp);
+}
+
+/* Call global finalizers/destructors.  */
+static void
+call_fini(void)
+{
+	/* Finalizers come from the .fini_array sections.  */
+	size_t i = __fini_array_end - __fini_array_start;
+	while (i-- > 0)
+		(*__fini_array_start [i])();
+
+	/* Modern systems don't require the .fini section.  */
+	/*_fini();*/
+}
+
+void __main(void)
+{
+	atexit(call_fini);
+	call_init(__libc_argc, __libc_argv, environ);
+}
+
+#endif /* __GCC_HAVE_INITFINI_ARRAY_SUPPORT */

mintlib/crtinit.c

@@ -86,58 +86,6 @@ char **__libc_argv = __libc_argv_default;
 
 static long parseargs(BASEPAGE *);
 
-#ifdef __ELF__
-
-/*
- * Support for the init/fini initialization mechanism.
- * Inspired from glibc's csu/libc-start.c.
- * https://sourceware.org/git/?p=glibc.git;f=csu/libc-start.c;hb=refs/heads/master
- */
-
-/* These magic symbols are provided by the linker.  */
-extern void (*__preinit_array_start [])(int, char **, char **);
-extern void (*__preinit_array_end [])(int, char **, char **);
-extern void (*__init_array_start [])(int, char **, char **);
-extern void (*__init_array_end [])(int, char **, char **);
-extern void (*__fini_array_start [])(void);
-extern void (*__fini_array_end [])(void);
-
-/* Call global initializers/constructors.  */
-static void
-call_init(int argc, char **argv, char **envp)
-{
-	/* Preinitializers come from the .preinit_array sections.  */
-	{
-		const size_t size = __preinit_array_end - __preinit_array_start;
-		size_t i;
-		for (i = 0; i < size; i++)
-			(*__preinit_array_start [i])(argc, argv, envp);
-	}
-
-	/* Modern systems don't require the .init section.  */
-	/*_init();*/
-
-	/* Initializers come from the .init_array sections.  */
-	const size_t size = __init_array_end - __init_array_start;
-	for (size_t i = 0; i < size; i++)
-		(*__init_array_start [i])(argc, argv, envp);
-}
-
-/* Call global finalizers/destructors.  */
-static void
-call_fini(void)
-{
-	/* Finalizers come from the .fini_array sections.  */
-	size_t i = __fini_array_end - __fini_array_start;
-	while (i-- > 0)
-		(*__fini_array_start [i])();
-
-	/* Modern systems don't require the .fini section.  */
-	/*_fini();*/
-}
-
-#endif /* __ELF__ */
-
 /*
  * accessories start here:
  */
@@ -166,13 +114,15 @@ _acc_main(void)
 	/* this is an accessory */
 	_app = 0;
 
-#ifdef __ELF__
+	__libc_argv = acc_argv;
+	environ = acc_argv;
+
+#ifdef __GCC_HAVE_INITFINI_ARRAY_SUPPORT
 	/* main() won't call __main() for global constructors, so do it here. */
-	atexit(call_fini);
-	call_init(1L, acc_argv, acc_argv);
+	__main();
 #endif
 
-	_main(1L, acc_argv, acc_argv);
+	_main(__libc_argc, __libc_argv, environ);
 	/*NOTREACHED*/
 }
 
@@ -254,10 +204,9 @@ _crtinit(void)
 	/* start profiling, if we were linked with gcrt0.o */
 	_monstartup((void *)bp->p_tbase, (void *)((long)etext - 1));
 
-#ifdef __ELF__
+#ifdef __GCC_HAVE_INITFINI_ARRAY_SUPPORT
 	/* main() won't call __main() for global constructors, so do it here. */
-	atexit(call_fini);
-	call_init(__libc_argc, __libc_argv, environ);
+	__main();
 #endif
 
 	_main(__libc_argc, __libc_argv, environ);

mintlib/lib.h

@@ -39,6 +39,9 @@ void	_main		(long, char **, char **);
 void	_acc_main	(void);
 void	_setstack	(char *);
 
+/* automagically called, either on entry to main(), or by use of .init_array */
+void __main (void);
+
 void	_monstartup	(void *lowpc, void *highpc);