Fix build on NetBSD aarch64

3 files changed, 38 insertions, 6 deletions

diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index 3b91ac45408..19b4734ff3d 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.49 2018/03/17 01:06:18 ryoon Exp $
+$NetBSD: distinfo,v 1.50 2018/05/12 09:01:08 jmcneill Exp $
 
 SHA1 (nspr-4.19.tar.gz) = 907221d51a1f8cca0c3a9e1af93c53e02f5e203b
 RMD160 (nspr-4.19.tar.gz) = b29350e8e4a551e5c680562c3c98219f19567738
 SHA512 (nspr-4.19.tar.gz) = 45a48111d0f89db0649a5e1356719868ff81881f9cf48c22c1d13b0831978b103f19e9840d6a5359fcdc90d763c0a60f0a29f7840d756a5efbd53ce1afd36844
 Size (nspr-4.19.tar.gz) = 1139967 bytes
-SHA1 (patch-ab) = d93c055bbb12bd9edf5f21138a93898d6b3b3c73
+SHA1 (patch-ab) = a24f80c2bab73c12b02d0aad7649da0ce4ca8d4f
 SHA1 (patch-ac) = a3d2cef788393b84e833d9e33bdf40b10d8efbd0
 SHA1 (patch-ae) = c6cf30927792140d867bb4dc3adf19786f6cdbe0
 SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24
 SHA1 (patch-ba) = 141b354b9ec0423a9c671d5eaca05cf16daac312
+SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = c7a652afc962e83cca49f451f6692bbc43644403
 SHA1 (patch-nspr_pr_include_md___pth.h) = f2c122b0af7635bea14e8cb60fad106e79b62f24
 SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 1aaa1048399cc7a82a67b98ea2368033cb597ac6
 SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 54d3fbd4c515290395b66f6b9e736a01a8318244
diff --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab
index d91b53b3da6..acdca374a48 100644
--- a/devel/nspr/patches/patch-ab
+++ b/devel/nspr/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.8 2013/07/20 08:57:20 ryoon Exp $
+$NetBSD: patch-ab,v 1.9 2018/05/12 09:01:08 jmcneill Exp $
 
---- nsprpub/pr/include/md/_netbsd.h.orig	2012-03-06 13:13:52.000000000 +0000
+--- nspr/pr/include/md/_netbsd.h.orig	2018-03-05 15:50:28.000000000 +0000
 +++ nspr/pr/include/md/_netbsd.h
-@@ -47,7 +47,7 @@
+@@ -30,6 +30,8 @@
+ #elif defined(__arm32__) || defined(__arm__) || defined(__armel__) \
+     || defined(__armeb__)
+ #define _PR_SI_ARCHITECTURE "arm"
++#elif defined(__aarch64__)
++#define _PR_SI_ARCHITECTURE "aarch64"
+ #endif
+ 
+ #if defined(__ELF__)
+@@ -47,7 +49,7 @@
  #define HAVE_DLL
  #define USE_DLFCN
  #define _PR_HAVE_SOCKADDR_LEN
@@ -11,7 +20,7 @@ $NetBSD: patch-ab,v 1.8 2013/07/20 08:57:20 ryoon Exp $
  #define _PR_STAT_HAS_ST_ATIMESPEC
  #define _PR_POLL_AVAILABLE
  #define _PR_USE_POLL
-@@ -75,6 +75,8 @@
+@@ -75,6 +77,8 @@
  #define JB_SP_INDEX 2
  #elif defined(__mips__)
  #define JB_SP_INDEX 4
@@ -20,3 +29,12 @@ $NetBSD: patch-ab,v 1.8 2013/07/20 08:57:20 ryoon Exp $
  #elif defined(__alpha__)
  #define JB_SP_INDEX 34
  #elif defined(__arm32__)
+@@ -86,6 +90,8 @@
+ #else
+ #define JB_SP_INDEX _JB_REG_R13
+ #endif
++#elif defined(__aarch64__)
++#define JB_SP_INDEX _JB_SP
+ #else
+ #error "Need to define SP index in jmp_buf here"
+ #endif
diff --git a/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg b/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
new file mode 100644
index 00000000000..28cf98ed8bc
--- /dev/null
+++ b/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
@@ -0,0 +1,13 @@
+$NetBSD: patch-nspr_pr_include_md___netbsd.cfg,v 1.1 2018/05/12 09:01:08 jmcneill Exp $
+
+--- nspr/pr/include/md/_netbsd.cfg.orig	2018-03-05 15:50:28.000000000 +0000
++++ nspr/pr/include/md/_netbsd.cfg
+@@ -203,7 +203,7 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
+-#elif defined(__amd64__)
++#elif defined(__amd64__) || defined(__aarch64__)
+ #define IS_LITTLE_ENDIAN 1
+ #undef  IS_BIG_ENDIAN
+ #define HAVE_ALIGNED_DOUBLES