From fec2a7b2429620956a1b043552ca621be771f2a7 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 5 Sep 2019 18:47:58 +0000 Subject: [PATCH] Catch up our non-upstreamed riscv parts in libunwind: * DEFINE_LIBUNWIND_PRIVATE_FUNCTION changed into DEFINE_LIBUNWIND_FUNCTION * unw_getcontext changed into __unw_getcontext --- contrib/libunwind/src/UnwindRegistersRestore.S | 2 +- contrib/libunwind/src/UnwindRegistersSave.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/libunwind/src/UnwindRegistersRestore.S b/contrib/libunwind/src/UnwindRegistersRestore.S index 1bd7da297376..220830c266c6 100644 --- a/contrib/libunwind/src/UnwindRegistersRestore.S +++ b/contrib/libunwind/src/UnwindRegistersRestore.S @@ -817,7 +817,7 @@ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind14Registers_or1k6jumptoEv) // thread_state pointer is in a0 // .p2align 2 -DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_riscv6jumptoEv) +DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind15Registers_riscv6jumptoEv) #ifdef __riscv_float_abi_double fld f0, (8 * 32 + 8 * 0)(a0) fld f1, (8 * 32 + 8 * 1)(a0) diff --git a/contrib/libunwind/src/UnwindRegistersSave.S b/contrib/libunwind/src/UnwindRegistersSave.S index e9d0e35c8afe..c98268e55a0b 100644 --- a/contrib/libunwind/src/UnwindRegistersSave.S +++ b/contrib/libunwind/src/UnwindRegistersSave.S @@ -557,7 +557,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext) #elif defined(__ppc__) // -// extern int unw_getcontext(unw_context_t* thread_state) +// extern int __unw_getcontext(unw_context_t* thread_state) // // On entry: // thread_state pointer is in r3 @@ -948,12 +948,12 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext) #elif defined(__riscv) # -# extern int unw_getcontext(unw_context_t* thread_state) +# extern int __unw_getcontext(unw_context_t* thread_state) # # On entry: # thread_state pointer is in a0 # -DEFINE_LIBUNWIND_FUNCTION(unw_getcontext) +DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext) // x0 is zero sd x1, (8 * 1)(a0) sd x2, (8 * 2)(a0)