rework langinfo code for ABI compat and for use by time code

[musl] / src / env / __libc_start_main.c

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index 04a454e..2a8698b 100644 (file)
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -5,11 +5,19 @@ 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
 
 extern size_t __hwcap, __sysinfo;
+extern char *__progname, *__progname_full;
 
-void __init_libc(char **envp)
+void __init_libc(char **envp, char *pn)
 {
        size_t i, *auxv, aux[AUX_CNT] = { 0 };
        __environ = envp;
@@ -19,27 +27,25 @@ void __init_libc(char **envp)
        __hwcap = aux[AT_HWCAP];
        __sysinfo = aux[AT_SYSINFO];
 
+       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);
-
-#ifdef SHARED
-       __init_ldso_ctors();
+#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 */