From fdb3078305a261d73312ca238258240d151d0d96 Mon Sep 17 00:00:00 2001 From: Ivy Xu Date: Mon, 29 Jun 2026 22:47:21 +0800 Subject: [PATCH] [3.15] gh-151040: Fix `test_c_stack_unwind` on RISC-V (GH-152370) (cherry picked from commit 1b0c05f14807a43d070127b3d8eac1af8de27f28) Co-authored-by: Ivy Xu --- Modules/_testinternalcapi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c index 92a49d003ca735..344d663624b270 100644 --- a/Modules/_testinternalcapi.c +++ b/Modules/_testinternalcapi.c @@ -98,6 +98,11 @@ static const uintptr_t min_frame_pointer_addr = 0x1000; // https://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi-1.9.html#STACK # define FRAME_POINTER_NEXT_OFFSET 0 # define FRAME_POINTER_RETURN_OFFSET 2 +#elif defined(__riscv) +// RISC-V saves the return address at fp[-1], and the previous frame pointer at fp[-2]. +// See: https://riscv-non-isa.github.io/riscv-elf-psabi-doc/#_frame_pointer_convention +# define FRAME_POINTER_NEXT_OFFSET -2 +# define FRAME_POINTER_RETURN_OFFSET -1 #else # define FRAME_POINTER_NEXT_OFFSET 0 # define FRAME_POINTER_RETURN_OFFSET 1