git: bd75df196d7e - stable/12 - Change the return value of _Unwind_GetCFA in include/unwind.h.

From: Dimitry Andric <>
Date: Sun, 20 Feb 2022 17:03:43 UTC
The branch stable/12 has been updated by dim:


commit bd75df196d7e34a6d5e92185cc8c6dbe4f24a222
Author:     John Baldwin <>
AuthorDate: 2022-01-27 22:42:40 +0000
Commit:     Dimitry Andric <>
CommitDate: 2022-02-20 12:33:42 +0000

    Change the return value of _Unwind_GetCFA in include/unwind.h.
    I tested the original commit as part of a series that culminates in
    removing this header and installing LLVM libunwind's unwind.h in its
    place so missed updating this header as was done in b84693501af6.
    Pointy hat to:  jhb
    Reported by:    kevans
    Fixes:          3a502289d316 Use uintptr_t for return type of _Unwind_GetCFA.
    (cherry picked from commit 522f5383547a2b3980f097a647b25f12c15411af)
 include/unwind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/unwind.h b/include/unwind.h
index 214fb43730aa..a872c0a094ba 100644
--- a/include/unwind.h
+++ b/include/unwind.h
@@ -124,7 +124,7 @@ extern unsigned long _Unwind_GetBSP (struct _Unwind_Context *);
 /* Return the "canonical frame address" for the given context.
    This is used by NPTL... */
-extern unsigned long _Unwind_GetCFA (struct _Unwind_Context *);
+extern uintptr_t _Unwind_GetCFA (struct _Unwind_Context *);
 /* Return the base-address for data references.  */
 extern unsigned long _Unwind_GetDataRelBase (struct _Unwind_Context *);