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];
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;
/* Barrier against hoisting application code or anything using ssp
* or thread pointer prior to its initialization above. */
- int (*stage2)(int (*)(int,char **,char **), int, char **);
- __asm__ ( "" : "=r"(stage2) : "0"(libc_start_main_stage2) : "memory" );
+ lsm2_fn *stage2 = libc_start_main_stage2;
+ __asm__ ( "" : "+r"(stage2) : : "memory" );
return stage2(main, argc, argv);
}