X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__libc_start_main.c;h=04a454e8bf9c9031f87ac4a230627532050195b4;hb=f4ded939bf90cd6baed6b4e723e54a62c9bdb6b9;hp=f31222b226b7e31b2b3d02a72880afd13e721244;hpb=df0b5a49406763aa4719dfad561a5de8924ecd59;p=musl

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index f31222b2..04a454e8 100644
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -1,25 +1,47 @@
+#include <elf.h>
 #include "libc.h"
 
+void __init_tls(size_t *);
 void __init_security(size_t *);
+void __init_ldso_ctors(void);
+
+#define AUX_CNT 38
+
+extern size_t __hwcap, __sysinfo;
+
+void __init_libc(char **envp)
+{
+	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];
+
+	__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))
 {
-	char **envp = argv+argc+1, **auxv = envp;
+	char **envp = argv+argc+1;
+
+	__init_libc(envp);
 
-	__environ = envp;
-	do auxv++; while (*auxv);
-	libc.auxv = (void *)++auxv;
 	libc.ldso_fini = ldso_fini;
 	libc.fini = fini;
 
-	__init_security((void *)auxv);
-
 	/* Execute constructors (static) linked into the application */
 	if (init) init(argc, argv, envp);
 
+#ifdef SHARED
+	__init_ldso_ctors();
+#endif
+
 	/* Pass control to to application */
 	exit(main(argc, argv, envp));
 	return 0;