Teach about difference of struct mcontext_t on Linux/i386 vs NetBSD/i386.

Fixes build on NetBSD/i386.

2 files changed, 18 insertions, 13 deletions

diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo
index 03af831a005..d5dd5771e1c 100644
--- a/x11/qt5-qtwebkit/distinfo
+++ b/x11/qt5-qtwebkit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/10/26 19:04:01 adam Exp $
+$NetBSD: distinfo,v 1.6 2016/03/15 00:19:00 tnn Exp $
 
 SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7
 RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9
@@ -12,7 +12,7 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37
-SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 3b73e876e89e920267a6bd19dba696298f00c704
+SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 6dbdaf1aad0fbbe39f8a3e5fb48be38e3ac67aa8
 SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288
 SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c
 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 875cfb3a98b943a78bf87e91d724d067b5bd2523
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
index 8fd162037a3..8f3774540d5 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.2 2016/03/15 00:19:00 tnn Exp $
 
 * Add NetBSD support
 
---- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig	2013-11-27 01:01:49.000000000 +0000
+--- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig	2015-10-13 04:37:12.000000000 +0000
 +++ Source/JavaScriptCore/tools/CodeProfiling.cpp
 @@ -33,7 +33,7 @@
  #include <signal.h>
@@ -22,16 +22,21 @@ $NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.1 2014/12/30 17
  // Helper function to start & stop the timer.
  // Presently we're using the wall-clock timer, since this seems to give the best results.
  static void setProfileTimer(unsigned usec)
-@@ -73,7 +73,7 @@ static void profilingTimer(int, siginfo_
-     CodeProfiling::sample(reinterpret_cast<void*>(context->__ss.__rip),
-                           reinterpret_cast<void**>(context->__ss.__rbp));
+@@ -80,6 +80,13 @@ static void profilingTimer(int, siginfo_
+     CodeProfiling::sample(reinterpret_cast<void*>(context.gregs[REG_EIP]),
+                           reinterpret_cast<void**>(context.gregs[REG_EBP]));
  }
--#elif OS(LINUX) && CPU(X86) && !OS(ANDROID)
-+#elif (OS(LINUX) || OS(NETBSD)) && CPU(X86) && !OS(ANDROID)
- static void profilingTimer(int, siginfo_t*, void* uap)
- {
-     mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext;
-@@ -143,7 +143,7 @@ void CodeProfiling::begin(const SourceCo
++#elif OS(NETBSD)) && CPU(X86)
++static void profilingTimer(int, siginfo_t*, void* uap)
++{
++    mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext;
++    CodeProfiling::sample(reinterpret_cast<void*>(context.__gregs[_REG_EIP]),
++                          reinterpret_cast<void**>(context.__gregs[_REG_EBP]));
++}
+ #endif
+ 
+ // Callback triggered when the timer is fired.
+@@ -143,7 +150,7 @@ void CodeProfiling::begin(const SourceCo
      if (alreadyProfiling)
          return;