From 00bd3b7d3006c5d350959c994fa65358bf65e6a2 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Sun, 21 Oct 2018 00:27:44 +0300 Subject: __libc_start_main: slightly simplify stage2 pointer setup Use "+r" in the asm instead of implementing a non-transparent copy by applying "0" constraint to the source value. Introduce a typedef for the function type to avoid spelling it out twice. --- src/env/__libc_start_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c index b4965d7f..7c95f822 100644 --- a/src/env/__libc_start_main.c +++ b/src/env/__libc_start_main.c @@ -66,7 +66,8 @@ 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) { @@ -79,8 +80,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)(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); } -- cgit v1.2.1