qt5-qtwebkit: implement missing js mcontext stuff for SunOS

3 files changed, 65 insertions, 12 deletions

diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo
index 7d9df5abe77..da79ac8b8fc 100644
--- a/x11/qt5-qtwebkit/distinfo
+++ b/x11/qt5-qtwebkit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2022/03/26 12:14:25 tnn Exp $
+$NetBSD: distinfo,v 1.25 2022/03/28 14:38:50 tnn Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -10,12 +10,12 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaa
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = d3ed3a25085752598dc04582eb80636c9cc6eaa9
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849
 SHA1 (patch-Source_JavaScriptCore_generate-bytecode-files) = b58ca94781fcf7b9f6a3eba715af2784e7a0acc0
-SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 35f2ba0cc3fe0d76c28a3a244621291a17a5334a
+SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2b7dba0d0e87ed96c4d7de6ddb5833209cfe51b5
 SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e
 SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96
-SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 64ea54605fbe787be57f7423e33802def66d6432
+SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 7ffc086a21f645112ad10296571464a1e15b8b44
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d
 SHA1 (patch-Source_WTF_wtf_Platform.h) = 73e8b07e8d7e718abe986a12b9f0b903dfcc4765
 SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
index 01d930accc0..d1f270a8ef6 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
@@ -1,10 +1,28 @@
-$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.3 2019/12/13 09:48:02 mrg Exp $
+$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.4 2022/03/28 14:38:50 tnn Exp $
 
 Support NetBSD on x86, arm, arm64 and mips.
+Support SunOS (Illumos-derived) on x86_64 
 
---- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2019-06-26 09:25:02.000000000 -0700
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp	2019-12-12 19:40:05.519044971 -0800
-@@ -665,6 +665,22 @@
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2020-03-04 17:16:37.000000000 +0000
++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -54,6 +54,7 @@
+ 
+ #if OS(SOLARIS)
+ #include <thread.h>
++#include <sys/regset.h>
+ #else
+ #include <pthread.h>
+ #endif
+@@ -483,7 +484,7 @@ size_t MachineThreads::Thread::getRegist
+     return sizeof(CONTEXT);
+ #elif USE(PTHREADS)
+     pthread_attr_init(&regs.attribute);
+-#if HAVE(PTHREAD_NP_H) || OS(NETBSD)
++#if HAVE(PTHREAD_NP_H) || OS(NETBSD) || OS(SOLARIS) /* XXX this is OK for Illumos, but not Oracle */
+ #if !OS(OPENBSD)
+     // e.g. on FreeBSD 5.4, neundorf@kde.org
+     pthread_attr_get_np(platformThread, &regs.attribute);
+@@ -665,6 +666,31 @@ void* MachineThreads::Thread::Registers:
  #error Unknown Architecture
  #endif
  
@@ -24,10 +42,19 @@ Support NetBSD on x86, arm, arm64 and mips.
 +#error Unknown Architecture
 +#endif
 +
++#elif OS(SOLARIS)
++#if CPU(X86)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RBP]);
++#else
++#error Unknown Architecture
++#endif
++
  #elif defined(__GLIBC__)
  
  // The following sequence depends on glibc's sys/ucontext.h.
-@@ -747,6 +763,22 @@
+@@ -747,6 +773,31 @@ void* MachineThreads::Thread::Registers:
  #error Unknown Architecture
  #endif
  
@@ -47,10 +74,19 @@ Support NetBSD on x86, arm, arm64 and mips.
 +#error Unknown Architecture
 +#endif
 +
++#elif OS(SOLARIS)
++#if CPU(X86)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RIP]);
++#else
++#error Unknown Architecture
++#endif
++
  #elif defined(__GLIBC__)
  
  // The following sequence depends on glibc's sys/ucontext.h.
-@@ -838,6 +870,22 @@
+@@ -838,6 +889,31 @@ void* MachineThreads::Thread::Registers:
  #error Unknown Architecture
  #endif
  
@@ -70,6 +106,15 @@ Support NetBSD on x86, arm, arm64 and mips.
 +#error Unknown Architecture
 +#endif
 +
++#elif OS(SOLARIS)
++#if CPU(X86)
++#error fixme
++#elif CPU(X86_64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_R8]);
++#else
++#error Unknown Architecture
++#endif
++
  #elif defined(__GLIBC__)
  
  // The following sequence depends on glibc's sys/ucontext.h.
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_InlineASM.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_InlineASM.h
index ac204156a4e..50c28cd6675 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_InlineASM.h
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_InlineASM.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_WTF_wtf_InlineASM.h,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_WTF_wtf_InlineASM.h,v 1.2 2022/03/28 14:38:50 tnn Exp $
 
 * Add NetBSD support
 * Add Solaris/SunOS support
 
---- Source/WTF/wtf/InlineASM.h.orig	2013-11-27 01:01:21.000000000 +0000
+--- Source/WTF/wtf/InlineASM.h.orig	2020-03-04 17:16:37.000000000 +0000
 +++ Source/WTF/wtf/InlineASM.h
-@@ -42,7 +42,7 @@
+@@ -40,7 +40,7 @@
  #define THUMB_FUNC_PARAM(name)
  #endif
  
@@ -14,3 +14,11 @@ $NetBSD: patch-Source_WTF_wtf_InlineASM.h,v 1.1 2014/12/30 17:23:47 adam Exp $
  #define GLOBAL_REFERENCE(name) #name "@plt"
  #elif CPU(X86) && COMPILER(MINGW)
  #define GLOBAL_REFERENCE(name) "@" #name "@4"
+@@ -84,6 +84,7 @@
+     || OS(OPENBSD)             \
+     || OS(HURD)                \
+     || OS(NETBSD)              \
++    || OS(SOLARIS)             \
+     || COMPILER(MINGW)
+     // GNU as-compatible syntax.
+ #define LOCAL_LABEL_STRING(name) ".L" #name