--- include/tdep-arm/libunwind_i.h.orig	2021-07-08 09:17:46.632751000 +1000
+++ include/tdep-arm/libunwind_i.h	2021-07-08 09:19:02.514358000 +1000
@@ -90,6 +90,8 @@
         ARM_SCF_LINUX_OLD_RT_SIGFRAME,  /* RT signal frame, kernel < 2.6.18 */
         ARM_SCF_FREEBSD_SIGFRAME,	/* FreeBSD sigframe */
 	ARM_SCF_FREEBSD_SYSCALL,	/* FreeBSD syscall stub */
+        ARM_SCF_BSDSUNIX_SIGFRAME,	/* BSDSUniX sigframe */
+	ARM_SCF_BSDSUNIX_SYSCALL,	/* BSDSUniX syscall stub */
       }
     sigcontext_format;
     unw_word_t sigcontext_addr;
--- include/tdep-ia64/libunwind_i.h.orig	2021-07-08 09:17:46.634452000 +1000
+++ include/tdep-ia64/libunwind_i.h	2021-07-08 09:20:14.768606000 +1000
@@ -86,7 +86,11 @@
 #define ABI_UNKNOWN                     0
 #define ABI_LINUX                       1
 #define ABI_HPUX                        2
+#ifdef __FreeBSD__
 #define ABI_FREEBSD                     3
+#else
+#define ABI_BSDSUNIX                    3
+#endif
 #define ABI_OPENVMS                     4
 #define ABI_NSK                         5       /* Tandem/HP Non-Stop Kernel */
 #define ABI_WINDOWS                     6
--- include/tdep-x86/jmpbuf.h.orig	2021-07-08 09:17:46.636053000 +1000
+++ include/tdep-x86/jmpbuf.h	2021-07-08 09:20:53.455218000 +1000
@@ -32,7 +32,7 @@
 #define JB_MASK_SAVED   6
 #define JB_MASK         7
 
-#elif defined __FreeBSD__
+#elif defined __FreeBSD__ || defined __BSDSUniX__
 
 #define JB_SP           2
 #define JB_RP           0
--- include/tdep-x86/libunwind_i.h.orig	2021-07-08 09:17:46.637648000 +1000
+++ include/tdep-x86/libunwind_i.h	2021-07-08 09:27:32.645646000 +1000
@@ -72,6 +72,10 @@
         X86_SCF_FREEBSD_SIGFRAME4,      /* FreeBSD 4.x x86 sigcontext */
         X86_SCF_FREEBSD_OSIGFRAME,      /* FreeBSD pre-4.x x86 sigcontext */
         X86_SCF_FREEBSD_SYSCALL,        /* FreeBSD x86 syscall */
+        X86_SCF_BSDSUNIX_SIGFRAME,      /* BSDSUniX x86 sigcontext */
+        X86_SCF_BSDSUNIX_SIGFRAME4,     /* FreeBSD 4.x x86 sigcontext */
+        X86_SCF_BSDSUNIX_OSIGFRAME,     /* BSDSUniX pre-4.x x86 sigcontext */
+        X86_SCF_BSDSUNIX_SYSCALL,       /* BSDSUniX x86 syscall */
       }
     sigcontext_format;
     unw_word_t sigcontext_addr;
--- include/tdep-x86_64/jmpbuf.h.orig	2021-07-08 09:17:46.639122000 +1000
+++ include/tdep-x86_64/jmpbuf.h	2021-07-08 09:27:46.598224000 +1000
@@ -33,7 +33,7 @@
 #define JB_MASK_SAVED   8
 #define JB_MASK         9
 
-#elif defined __FreeBSD__
+#elif defined __FreeBSD__ || defined __BSDSUniX__
 
 #define JB_SP           2
 #define JB_RP           0
--- include/tdep-x86_64/libunwind_i.h.orig	2021-07-08 09:17:46.640710000 +1000
+++ include/tdep-x86_64/libunwind_i.h	2021-07-08 09:28:45.873442000 +1000
@@ -90,6 +90,8 @@
         X86_64_SCF_FREEBSD_SIGFRAME,    /* FreeBSD signal frame */
         X86_64_SCF_FREEBSD_SYSCALL,     /* FreeBSD syscall */
         X86_64_SCF_SOLARIS_SIGFRAME,    /* illumos/Solaris signal frame */
+        X86_64_SCF_BSDSUNIX_SIGFRAME,   /* BSDSUniX signal frame */
+        X86_64_SCF_BSDSUNIX_SYSCALL,    /* BSDSUniX syscall */
       }
     sigcontext_format;
     unw_word_t sigcontext_addr;