elf.h: add ELFCOMPRESS_ZSTD

[musl] / src / env / __libc_start_main.c

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index 2e5f9dc..c5b277b 100644 (file)
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -28,7 +28,7 @@ void __init_libc(char **envp, char *pn)
        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];
+       if (aux[AT_SYSINFO]) __sysinfo = aux[AT_SYSINFO];
        libc.page_size = aux[AT_PAGESZ];
 
        if (!pn) pn = (void*)aux[AT_EXECFN];
@@ -66,9 +66,11 @@ static void libc_start_init(void)
 
 weak_alias(libc_start_init, __libc_start_init);
 
-static int libc_start_main_stage2(int (*)(int,char **,char **), int, char **);
+typedef int lsm2_fn(int (*)(int,char **,char **), int, char **);
+static lsm2_fn libc_start_main_stage2;
 
-int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv)
+int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv,
+       void (*init_dummy)(), void(*fini_dummy)(), void(*ldso_dummy)())
 {
        char **envp = argv+argc+1;
 
@@ -79,8 +81,8 @@ int __libc_start_main(int (*main)(int,char **,char **), int argc, char **argv)
 
        /* Barrier against hoisting application code or anything using ssp
         * or thread pointer prior to its initialization above. */
-       int (*stage2)();
-       __asm__ ( "" : "=r"(stage2) : "r"(libc_start_main_stage2) : "memory" );
+       lsm2_fn *stage2 = libc_start_main_stage2;
+       __asm__ ( "" : "+r"(stage2) : : "memory" );
        return stage2(main, argc, argv);
 }