--- Makefile	(revision 510820)
+++ Makefile	(working copy)
@@ -5,7 +5,7 @@ 
 PORTVERSION=	20170615	# This is the release date of libunwind 1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH
-DISTNAME=	${PORTNAME}-1.2.1
+DISTNAME=	${PORTNAME}-1.3.1
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Generic stack unwinding library
--- distinfo	(revision 510820)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1515854352
-SHA256 (libunwind-1.2.1.tar.gz) = 3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb
-SIZE (libunwind-1.2.1.tar.gz) = 780774
+TIMESTAMP = 1567441647
+SHA256 (libunwind-1.3.1.tar.gz) = 43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8
+SIZE (libunwind-1.3.1.tar.gz) = 801262
--- files/patch-include_libunwind-aarch64.h	(revision 510820)
+++ files/patch-include_libunwind-aarch64.h	(working copy)
@@ -1,4 +1,4 @@ 
---- include/libunwind-aarch64.h.orig	2018-06-15 23:58:09 UTC
+--- include/libunwind-aarch64.h.orig	2019-09-02 17:16:29 UTC
 +++ include/libunwind-aarch64.h
 @@ -177,7 +177,7 @@ typedef ucontext_t unw_tdep_context_t;
  
--- files/patch-include_libunwind__i.h	(revision 510820)
+++ files/patch-include_libunwind__i.h	(nonexistent)
@@ -1,14 +0,0 @@ 
---- include/libunwind_i.h.orig	2018-06-15 23:58:15 UTC
-+++ include/libunwind_i.h
-@@ -86,6 +86,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
- #   error Host has unknown byte-order.
- # endif
- #endif
-+#ifdef __FreeBSD__
-+#define __BYTE_ORDER BYTE_ORDER
-+#define __LITTLE_ENDIAN LITTLE_ENDIAN
-+#define __BIG_ENDIAN BIG_ENDIAN
-+#endif
- 
- #if defined(HAVE__BUILTIN_UNREACHABLE)
- # define unreachable() __builtin_unreachable()
--- files/patch-src_aarch64_Ginit.c	(revision 510820)
+++ files/patch-src_aarch64_Ginit.c	(working copy)
@@ -1,11 +1,11 @@ 
---- src/aarch64/Ginit.c.orig	2018-06-15 23:58:20 UTC
+--- src/aarch64/Ginit.c.orig	2019-09-02 16:52:44 UTC
 +++ src/aarch64/Ginit.c
 @@ -44,7 +44,7 @@ static inline void *
  uc_addr (ucontext_t *uc, int reg)
  {
-   if (reg >= UNW_AARCH64_X0 && reg <= UNW_AARCH64_V31)
+   if (reg >= UNW_AARCH64_X0 && reg < UNW_AARCH64_V0)
 -    return &uc->uc_mcontext.regs[reg];
 +    return &uc->uc_mcontext.mc_gpregs.gp_x[reg];
+   else if (reg >= UNW_AARCH64_V0 && reg <= UNW_AARCH64_V31)
+     return &GET_FPCTX(uc)->vregs[reg - UNW_AARCH64_V0];
    else
-     return NULL;
- }
--- files/patch-src_coredump___UCD__access__reg_freebsd.c	(nonexistent)
+++ files/patch-src_coredump___UCD__access__reg_freebsd.c	(working copy)
@@ -0,0 +1,13 @@ 
+--- src/coredump/_UCD_access_reg_freebsd.c.orig	2019-09-02 16:42:43 UTC
++++ src/coredump/_UCD_access_reg_freebsd.c
+@@ -129,6 +129,10 @@ _UCD_access_reg (unw_addr_space_t as,
+        return -UNW_EINVAL;
+      }
+   }
++#elif defined(UNW_TARGET_AARCH64)
++  if (regnum < 0 || regnum >= UNW_AARCH64_FPCR)
++    return -UNW_EINVAL;
++  *valp = ui->prstatus->pr_reg.x[regnum];
+ #else
+ #error Port me
+ #endif
--- files/patch-src_ptrace___UPT__access_fpreg.c	(nonexistent)
+++ files/patch-src_ptrace___UPT__access_fpreg.c	(working copy)
@@ -0,0 +1,20 @@ 
+--- src/ptrace/_UPT_access_fpreg.c.orig	2019-09-02 16:56:31 UTC
++++ src/ptrace/_UPT_access_fpreg.c
+@@ -84,6 +84,8 @@ _UPT_access_fpreg (unw_addr_space_t as, 
+ #elif defined(__arm__)
+   if ((unsigned) reg < UNW_ARM_F0 || (unsigned) reg > UNW_ARM_F7)
+     return -UNW_EBADREG;
++#elif defined(__aarch64__)
++          memcpy(&fpreg.fp_q[reg], val, sizeof(unw_fpreg_t));
+ #else
+ #error Fix me
+ #endif
+@@ -99,6 +101,8 @@ _UPT_access_fpreg (unw_addr_space_t as, 
+           memcpy(&fpreg.fpr_acc[reg], val, sizeof(unw_fpreg_t));
+ #elif defined(__arm__)
+           memcpy(&fpreg.fpr[reg], val, sizeof(unw_fpreg_t));
++#elif defined(__aarch64__)
++          memcpy(val, &fpreg.fp_q[reg], sizeof(unw_fpreg_t));
+ #else
+ #error Fix me
+ #endif
--- files/patch-tests-mapper.c	(revision 510820)
+++ files/patch-tests-mapper.c	(nonexistent)
@@ -1,12 +0,0 @@ 
---- tests/mapper.c.orig	2014-10-06 14:46:27.000000000 -0400
-+++ tests/mapper.c	2014-10-06 14:47:00.000000000 -0400
-@@ -39,6 +39,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
- #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
- # define MAP_ANONYMOUS MAP_ANON
- #endif
-+#if !defined(MAP_NORESERVE)
-+# define MAP_NORESERVE 0
-+#endif
- 
- int
- main (void)