X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__libc_start_main.c;h=73d4932788d4a6a33396d887912e753699b83b69;hb=a7dbcf5c8ca7edb7a46eb276031ad1df4131135b;hp=07613a522b01cba6609295b59fe30835d4be17dd;hpb=0a96a37f06fda78ce3674b425888b1fc090578aa;p=musl

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index 07613a52..73d49327 100644
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -3,36 +3,51 @@
 
 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
 
-void __init_libc(char **envp)
+extern size_t __hwcap, __sysinfo;
+extern char *__progname, *__progname_full;
+
+void __init_libc(char **envp, char *pn)
 {
-	size_t i, *auxv, aux[AUX_CNT];
+	size_t i, *auxv, aux[AUX_CNT] = { 0 };
 	__environ = envp;
 	for (i=0; envp[i]; i++);
 	libc.auxv = auxv = (void *)(envp+i+1);
 	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;
+		for (i=0; pn[i]; i++) if (pn[i]=='/') __progname = pn+i+1;
+	}
 
 	__init_tls(aux);
 	__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;
 
-	__init_libc(envp);
-
-	libc.ldso_fini = ldso_fini;
-	libc.fini = fini;
-
-	/* Execute constructors (static) linked into the application */
-	if (init) init(argc, argv, envp);
+#ifndef SHARED
+	__init_libc(envp, argv[0]);
+	_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 */
 	exit(main(argc, argv, envp));