diff --git a/devel/libunwind/files/patch-include_tdep-x86__64_libunwind__i.h b/devel/libunwind/files/patch-include_tdep-x86__64_libunwind__i.h
new file mode 100644
index 000000000000..51d4a15c8757
--- /dev/null
+++ b/devel/libunwind/files/patch-include_tdep-x86__64_libunwind__i.h
@@ -0,0 +1,13 @@
+--- include/tdep-x86_64/libunwind_i.h.orig	2021-11-26 16:58:55 UTC
++++ include/tdep-x86_64/libunwind_i.h
+@@ -288,9 +288,9 @@ extern void tdep_reuse_frame (struct dwarf_cursor *c,
+ extern int tdep_cache_frame (struct dwarf_cursor *c);
+ extern void tdep_reuse_frame (struct dwarf_cursor *c,
+                               int frame);
++#endif
+ extern void tdep_stash_frame (struct dwarf_cursor *c,
+                               struct dwarf_reg_state *rs);
+-#endif
+ 
+ extern int tdep_getcontext_trace (unw_tdep_context_t *);
+ extern int tdep_trace (unw_cursor_t *cursor, void **addresses, int *n);
diff --git a/devel/libunwind/files/patch-src_setjmp_siglongjmp.c b/devel/libunwind/files/patch-src_setjmp_siglongjmp.c
new file mode 100644
index 000000000000..61728ff11f02
--- /dev/null
+++ b/devel/libunwind/files/patch-src_setjmp_siglongjmp.c
@@ -0,0 +1,11 @@
+--- src/setjmp/siglongjmp.c.orig	2020-11-10 16:14:18 UTC
++++ src/setjmp/siglongjmp.c
+@@ -108,7 +108,7 @@ siglongjmp (sigjmp_buf env, int val)
+                     && unw_set_reg (&c, UNW_REG_EH + 3, wp[JB_MASK + 1]) < 0))
+               abort ();
+ #elif defined(__FreeBSD__)
+-          if (unw_set_reg (&c, UNW_REG_EH + 2, &wp[JB_MASK]) < 0)
++          if (unw_set_reg (&c, UNW_REG_EH + 2, wp[JB_MASK]) < 0)
+               abort();
+ #else
+ #error Port me