X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__libc_start_main.c;h=ac37492298520cea05a4fcdcd7cd513dd91aa885;hb=21ada94c4b8c01589367cea300916d7db8461ae7;hp=aef9f9ec72c6032f273309e111bc7c2b307310cd;hpb=b4ea63856a6af3d1bcc2db12537785371ac2024c;p=musl

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index aef9f9ec..ac374922 100644
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -3,7 +3,13 @@
 
 void __init_tls(size_t *);
 void __init_security(size_t *);
-void __init_ldso_ctors(void);
+
+#ifndef SHARED
+static void dummy() {}
+weak_alias(dummy, _init);
+extern void (*const __init_array_start)() __attribute__((weak));
+extern void (*const __init_array_end)() __attribute__((weak));
+#endif
 
 #define AUX_CNT 38
 
@@ -19,6 +25,7 @@ void __init_libc(char **envp, char *pn)
 	for (i=0; auxv[i]; i+=2) if (auxv[i]<AUX_CNT) aux[auxv[i]] = auxv[i+1];
 	__hwcap = aux[AT_HWCAP];
 	__sysinfo = aux[AT_SYSINFO];
+	libc.page_size = aux[AT_PAGESZ];
 
 	if (pn) {
 		__progname = __progname_full = pn;
@@ -29,23 +36,16 @@ void __init_libc(char **envp, char *pn)
 	__init_security(aux);
 }
 
-int __libc_start_main(
-	int (*main)(int, char **, char **), int argc, char **argv,
-	int (*init)(int, char **, char **), void (*fini)(void),
-	void (*ldso_fini)(void))
+int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv)
 {
 	char **envp = argv+argc+1;
 
+#ifndef SHARED
 	__init_libc(envp, argv[0]);
-
-	libc.ldso_fini = ldso_fini;
-	libc.fini = fini;
-
-	/* Execute constructors (static) linked into the application */
-	if (init) init(argc, argv, envp);
-
-#ifdef SHARED
-	__init_ldso_ctors();
+	_init();
+	uintptr_t a = (uintptr_t)&__init_array_start;
+	for (; a<(uintptr_t)&__init_array_end; a+=sizeof(void(*)()))
+		(*(void (**)())a)();
 #endif
 
 	/* Pass control to to application */