git: 3d6285b4dd1c - stable/13 - Use uintptr_t for return type of _Unwind_GetCFA.

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Sun, 20 Feb 2022 12:31:03 UTC
The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=3d6285b4dd1c32e290b0a901aa2bf3581b38eb58

commit 3d6285b4dd1c32e290b0a901aa2bf3581b38eb58
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-27 18:53:21 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-02-20 12:29:05 +0000

    Use uintptr_t for return type of _Unwind_GetCFA.
    
    This matches the type in other unwind headers.
    
    Reviewed by:    dim, emaste
    Differential Revision:  https://reviews.freebsd.org/D34050
    
    (cherry picked from commit 3a502289d316f726fec24087012fabb06313a2bf)
---
 lib/libthr/thread/thr_exit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c
index c1244962f192..b9d81787c3bb 100644
--- a/lib/libthr/thread/thr_exit.c
+++ b/lib/libthr/thread/thr_exit.c
@@ -67,7 +67,7 @@ static _Unwind_Reason_Code thread_unwind_stop(int version,
 /* unwind library pointers */
 static _Unwind_Reason_Code (*uwl_forcedunwind)(struct _Unwind_Exception *,
 	_Unwind_Stop_Fn, void *);
-static unsigned long (*uwl_getcfa)(struct _Unwind_Context *);
+static uintptr_t (*uwl_getcfa)(struct _Unwind_Context *);
 
 static void
 thread_uw_init(void)
@@ -109,7 +109,7 @@ _Unwind_ForcedUnwind(struct _Unwind_Exception *ex, _Unwind_Stop_Fn stop_func,
 	return (*uwl_forcedunwind)(ex, stop_func, stop_arg);
 }
 
-unsigned long
+uintptr_t
 _Unwind_GetCFA(struct _Unwind_Context *context)
 {
 	return (*uwl_getcfa)(context);