d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch up our non-upstreamed riscv parts in libunwind:

Browse Source 
* DEFINE_LIBUNWIND_PRIVATE_FUNCTION changed into
  DEFINE_LIBUNWIND_FUNCTION
* unw_getcontext changed into __unw_getcontext
This commit is contained in:
Dimitry Andric 2019-09-05 18:47:58 +00:00
parent 24ea14660b
commit fec2a7b242
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libunwind/src/UnwindRegistersRestore.S
View File

@ -817,7 +817,7 @@ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind14Registers_or1k6jumptoEv)
// thread_state pointer is in a0 // thread_state pointer is in a0
// //
.p2align 2 .p2align 2
DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_riscv6jumptoEv) DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind15Registers_riscv6jumptoEv)
#ifdef __riscv_float_abi_double #ifdef __riscv_float_abi_double
fld f0, (8 * 32 + 8 * 0)(a0) fld f0, (8 * 32 + 8 * 0)(a0)
fld f1, (8 * 32 + 8 * 1)(a0) fld f1, (8 * 32 + 8 * 1)(a0)

6
contrib/libunwind/src/UnwindRegistersSave.S
View File

@ -557,7 +557,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
#elif defined(__ppc__) #elif defined(__ppc__)
// //
// extern int unw_getcontext(unw_context_t* thread_state) // extern int __unw_getcontext(unw_context_t* thread_state)
// //
// On entry: // On entry:
// thread_state pointer is in r3 // thread_state pointer is in r3
@ -948,12 +948,12 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
#elif defined(__riscv) #elif defined(__riscv)
# #
# extern int unw_getcontext(unw_context_t* thread_state) # extern int __unw_getcontext(unw_context_t* thread_state)
# #
# On entry: # On entry:
# thread_state pointer is in a0 # thread_state pointer is in a0
# #
DEFINE_LIBUNWIND_FUNCTION(unw_getcontext) DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
// x0 is zero // x0 is zero
sd x1, (8 * 1)(a0) sd x1, (8 * 1)(a0)
sd x2, (8 * 2)(a0) sd x2, (8 * 2)(a0)