devel/nspr: fix up mips64 and mips*el support

This syncs the patch with what landed upstream.

PR:		197577

1 files changed, 37 insertions, 26 deletions

diff --git a/devel/nspr/files/patch-bug1163346 b/devel/nspr/files/patch-bug1163346
index 134c5af5782b..5a9705386ba6 100644
--- a/devel/nspr/files/patch-bug1163346
+++ b/devel/nspr/files/patch-bug1163346
@@ -1,98 +1,109 @@
 --- ../pr/include/md/_freebsd.cfg.orig	2015-01-22 20:44:59 UTC
 +++ ../pr/include/md/_freebsd.cfg
-@@ -392,6 +392,97 @@
+@@ -392,6 +392,108 @@
  #define PR_BYTES_PER_WORD_LOG2   2
  #define PR_BYTES_PER_DWORD_LOG2  3
  
-+#elif defined(__mips__)
++#elif defined(__mips64__)
 +
++#if defined(__MIPSEB__) || defined(_MIPSEB)
 +#undef  IS_LITTLE_ENDIAN
 +#define IS_BIG_ENDIAN    1
++#else
++#undef  IS_BIG_ENDIAN
++#define IS_LITTLE_ENDIAN 1
++#endif
++
++#define IS_64
 +
 +#define PR_BYTES_PER_BYTE   1
 +#define PR_BYTES_PER_SHORT  2
 +#define PR_BYTES_PER_INT    4
 +#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_LONG   8
 +#define PR_BYTES_PER_FLOAT  4
 +#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_WORD   8
 +#define PR_BYTES_PER_DWORD  8
 +
 +#define PR_BITS_PER_BYTE    8
 +#define PR_BITS_PER_SHORT   16
 +#define PR_BITS_PER_INT     32
 +#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_LONG    64
 +#define PR_BITS_PER_FLOAT   32
 +#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    32
++#define PR_BITS_PER_WORD    64
 +
 +#define PR_BITS_PER_BYTE_LOG2   3
 +#define PR_BITS_PER_SHORT_LOG2  4
 +#define PR_BITS_PER_INT_LOG2    5
 +#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_LONG_LOG2   6
 +#define PR_BITS_PER_FLOAT_LOG2  5
 +#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   5
++#define PR_BITS_PER_WORD_LOG2   6
 +
 +#define PR_ALIGN_OF_SHORT   2
 +#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_LONG    8
 +#define PR_ALIGN_OF_INT64   8
 +#define PR_ALIGN_OF_FLOAT   4
 +#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 4
-+#define PR_ALIGN_OF_WORD    4
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
 +
-+#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_WORD_LOG2   3
 +#define PR_BYTES_PER_DWORD_LOG2  3
 +
-+#elif defined(__mips64__)
++#elif defined(__mips__)
 +
++#if defined(__MIPSEB__) || defined(_MIPSEB)
 +#undef  IS_LITTLE_ENDIAN
 +#define IS_BIG_ENDIAN    1
-+#define IS_64
++#else
++#undef  IS_BIG_ENDIAN
++#define IS_LITTLE_ENDIAN 1
++#endif
 +
 +#define PR_BYTES_PER_BYTE   1
 +#define PR_BYTES_PER_SHORT  2
 +#define PR_BYTES_PER_INT    4
 +#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_LONG   4
 +#define PR_BYTES_PER_FLOAT  4
 +#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_WORD   4
 +#define PR_BYTES_PER_DWORD  8
 +
 +#define PR_BITS_PER_BYTE    8
 +#define PR_BITS_PER_SHORT   16
 +#define PR_BITS_PER_INT     32
 +#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_LONG    32
 +#define PR_BITS_PER_FLOAT   32
 +#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
++#define PR_BITS_PER_WORD    32
 +
 +#define PR_BITS_PER_BYTE_LOG2   3
 +#define PR_BITS_PER_SHORT_LOG2  4
 +#define PR_BITS_PER_INT_LOG2    5
 +#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_LONG_LOG2   5
 +#define PR_BITS_PER_FLOAT_LOG2  5
 +#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
++#define PR_BITS_PER_WORD_LOG2   5
 +
 +#define PR_ALIGN_OF_SHORT   2
 +#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_LONG    4
 +#define PR_ALIGN_OF_INT64   8
 +#define PR_ALIGN_OF_FLOAT   4
 +#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
 +
-+#define PR_BYTES_PER_WORD_LOG2   3
++#define PR_BYTES_PER_WORD_LOG2   2
 +#define PR_BYTES_PER_DWORD_LOG2  3
 +
  #else
@@ -104,10 +115,10 @@
  #define _PR_SI_ARCHITECTURE "powerpc"
  #elif defined(__arm__)
  #define _PR_SI_ARCHITECTURE "arm"
-+#elif defined(__mips__)
-+#define _PR_SI_ARCHITECTURE "mips"
 +#elif defined(__mips64__)
 +#define _PR_SI_ARCHITECTURE "mips64"
++#elif defined(__mips__)
++#define _PR_SI_ARCHITECTURE "mips"
  #else
  #error "Unknown CPU architecture"
  #endif