From: Stafford Horne Date: Wed, 27 Oct 2021 21:54:05 +0000 (+0900) Subject: or1k: Add return address argument to _mcount call X-Git-Tag: upstream/12.2.0~3920 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=308531d148afa3fd77c0efc82a80b26300f9615a;p=platform%2Fupstream%2Fgcc.git or1k: Add return address argument to _mcount call This fixes an issue in the glibc port I am working on where the build fails due to the warning: error: calling ‘__builtin_return_address’ with a nonzero argument is unsafe [-Werror=frame-address] This is due to how the current implementation of _mcount in glibc uses __builtin_return_address with a count argument of 1. Fix that by passing the value of LR_REGNUM to the _mcount function, effectivtly providing the value _mcount is after. This is an ABI change, but I think it's OK because the glibc port for or1k is not yet upstreamed. Also, I think just adding an argument should not break anything anyway. gcc/ChangeLog: * config/or1k/or1k.h (PROFILE_HOOK): Add return address argument to _mcount. --- diff --git a/gcc/config/or1k/or1k.h b/gcc/config/or1k/or1k.h index 669907e..8a529f4 100644 --- a/gcc/config/or1k/or1k.h +++ b/gcc/config/or1k/or1k.h @@ -394,9 +394,10 @@ do { \ profiling a function entry. */ #define PROFILE_HOOK(LABEL) \ { \ - rtx fun; \ + rtx fun, ra; \ + ra = get_hard_reg_initial_val (Pmode, LR_REGNUM); \ fun = gen_rtx_SYMBOL_REF (Pmode, "_mcount"); \ - emit_library_call (fun, LCT_NORMAL, VOIDmode); \ + emit_library_call (fun, LCT_NORMAL, VOIDmode, ra, Pmode); \ } /* All the work is done in PROFILE_HOOK, but this is still required. */