mozjs60: Forward port required SunOS patches.

5 files changed, 79 insertions, 1 deletions

diff --git a/lang/mozjs60/distinfo b/lang/mozjs60/distinfo
index 39699fa9bcc..d9395786626 100644
--- a/lang/mozjs60/distinfo
+++ b/lang/mozjs60/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2020/04/05 06:10:28 wiz Exp $
+$NetBSD: distinfo,v 1.2 2020/04/09 09:40:47 jperkin Exp $
 
 SHA1 (mozjs60_60.8.0.orig.tar.xz) = b66207ee477c110995029f173e6b026f2e013591
 RMD160 (mozjs60_60.8.0.orig.tar.xz) = fef033969a51dc56c84669d33401f60bd499de6d
@@ -6,6 +6,10 @@ SHA512 (mozjs60_60.8.0.orig.tar.xz) = ad4d5d17824b1d0e50fc43a56cb5ffe022ffd150ce
 Size (mozjs60_60.8.0.orig.tar.xz) = 25294372 bytes
 SHA1 (patch-.._.._config_rules.mk) = cf3421d991e1cbfab4c0cdcb7b648b1388fa32d5
 SHA1 (patch-.._.._python_mozbuild_mozbuild_backend_recursivemake.py) = dda670432e5673c5d28dcf6c4902d4a724e71170
+SHA1 (patch-gc_Memory.cpp) = ba865bee4b99ce6298404b41b465b281fd23555f
 SHA1 (patch-jsdate.cpp) = f9314460476ffbc00fe85a75bddc964807d0153f
+SHA1 (patch-threading_posix_Thread.cpp) = c48a642fa98d8112c149142a4af4ac633d3ae332
+SHA1 (patch-util_NativeStack.cpp) = 68d2d80291a856c74bac2e6870317f143bb61355
 SHA1 (patch-vm_Time.cpp) = 5c08e7b3997055c50f40aadcaefb81628cf1133c
 SHA1 (patch-vm_Time.h) = 1dbc623a9b5e249d84bffd1b036feb7b6a54ce75
+SHA1 (patch-wasm_WasmSignalHandlers.cpp) = 9023ead4639414ab0ca6641191dcb1a9aab1298a
diff --git a/lang/mozjs60/patches/patch-gc_Memory.cpp b/lang/mozjs60/patches/patch-gc_Memory.cpp
new file mode 100644
index 00000000000..c321182c8eb
--- /dev/null
+++ b/lang/mozjs60/patches/patch-gc_Memory.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-gc_Memory.cpp,v 1.1 2020/04/09 09:40:47 jperkin Exp $
+
+Fix build on SunOS/x86_64.
+
+--- gc/Memory.cpp.orig	2019-07-01 09:07:41.000000000 +0000
++++ gc/Memory.cpp
+@@ -419,6 +419,7 @@ static inline void* MapMemoryAt(void* de
+                                 off_t offset = 0) {
+ 
+ #if defined(__ia64__) || defined(__aarch64__) ||  \
++    (defined(__sun) && defined(__x86_64__)) ||     \
+     (defined(__sparc__) && defined(__arch64__) && \
+      (defined(__NetBSD__) || defined(__linux__)))
+   MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0);
+@@ -468,6 +469,7 @@ static inline void* MapMemory(size_t len
+   }
+   return region;
+ #elif defined(__aarch64__) || \
++    (defined(__sun) && defined(__x86_64__)) || \
+     (defined(__sparc__) && defined(__arch64__) && defined(__linux__))
+   /*
+    * There might be similar virtual address issue on arm64 which depends on
diff --git a/lang/mozjs60/patches/patch-threading_posix_Thread.cpp b/lang/mozjs60/patches/patch-threading_posix_Thread.cpp
new file mode 100644
index 00000000000..35522a2ad15
--- /dev/null
+++ b/lang/mozjs60/patches/patch-threading_posix_Thread.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-threading_posix_Thread.cpp,v 1.1 2020/04/09 09:40:47 jperkin Exp $
+
+Fix build on SunOS/x86_64.
+
+--- threading/posix/Thread.cpp.orig	2019-07-01 09:07:44.000000000 +0000
++++ threading/posix/Thread.cpp
+@@ -160,6 +160,8 @@ void js::ThisThread::SetName(const char*
+   rv = 0;
+ #elif defined(__NetBSD__)
+   rv = pthread_setname_np(pthread_self(), "%s", (void*)name);
++#elif defined(__sun)
++  rv = 0; 
+ #else
+   rv = pthread_setname_np(pthread_self(), name);
+ #endif
diff --git a/lang/mozjs60/patches/patch-util_NativeStack.cpp b/lang/mozjs60/patches/patch-util_NativeStack.cpp
new file mode 100644
index 00000000000..5470aa3cc1e
--- /dev/null
+++ b/lang/mozjs60/patches/patch-util_NativeStack.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-util_NativeStack.cpp,v 1.1 2020/04/09 09:40:47 jperkin Exp $
+
+Fix build on SunOS/x86_64.
+
+--- util/NativeStack.cpp.orig	2019-07-01 09:07:43.000000000 +0000
++++ util/NativeStack.cpp
+@@ -30,7 +30,7 @@ void* js::GetNativeStackBaseImpl() {
+   return static_cast<void*>(pTib->StackBase);
+ }
+ 
+-#elif defined(SOLARIS)
++#elif defined(__sun)
+ 
+ #include <ucontext.h>
+ 
+@@ -69,6 +69,7 @@ void* js::GetNativeStackBaseImpl() {
+ #elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
+   /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
+   pthread_attr_get_np(thread, &sattr);
++#elif defined(__sun)
+ #else
+   /*
+    * FIXME: this function is non-portable;
diff --git a/lang/mozjs60/patches/patch-wasm_WasmSignalHandlers.cpp b/lang/mozjs60/patches/patch-wasm_WasmSignalHandlers.cpp
new file mode 100644
index 00000000000..16128f51a1a
--- /dev/null
+++ b/lang/mozjs60/patches/patch-wasm_WasmSignalHandlers.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-wasm_WasmSignalHandlers.cpp,v 1.1 2020/04/09 09:40:47 jperkin Exp $
+
+Fix build on SunOS/x86_64.
+
+--- wasm/WasmSignalHandlers.cpp.orig	2019-07-01 09:07:44.000000000 +0000
++++ wasm/WasmSignalHandlers.cpp
+@@ -138,6 +138,7 @@ struct AutoSignalHandler {
+ #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])
+ #define ESP_sig(p) ((p)->uc_mcontext.gregs[REG_ESP])
+ #else
++#include <sys/regset.h>
+ #define XMM_sig(p, i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i])
+ #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
+ #define EBP_sig(p) ((p)->uc_mcontext.gregs[REG_EBP])