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

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index 70af77b5..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"
 
-/* Any use of __environ/environ will override this symbol. */
-char **__dummy_environ = (void *)-1;
-weak_alias(__dummy_environ, ___environ);
+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))
 {
-	/* Save the environment if it may be used by libc/application */
 	char **envp = argv+argc+1;
-	if (___environ != (void *)-1) ___environ = envp;
 
-	/* Avoid writing 0 and triggering unnecessary COW */
-	if (ldso_fini) libc.ldso_fini = ldso_fini;
-	if (fini) libc.fini = fini;
+	__init_libc(envp);
+
+	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();
+#endif
+
 	/* Pass control to to application */
 	exit(main(argc, argv, envp));
 	return 0;