Title: [199470] releases/WebKitGTK/webkit-2.12/Source/_javascript_Core
- Revision
- 199470
- Author
- [email protected]
- Date
- 2016-04-13 06:13:10 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r198919 - Fails to build in Linux / PowerPC due to different ucontext_t definition
https://bugs.webkit.org/show_bug.cgi?id=156015
Reviewed by Michael Catanzaro.
PPC does not have mcontext_t in ucontext_t::uc_mcontext.
So we take the special way to retrieve mcontext_t in PPC.
* heap/MachineStackMarker.cpp:
(pthreadSignalHandlerSuspendResume):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog (199469 => 199470)
--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog 2016-04-13 13:12:06 UTC (rev 199469)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog 2016-04-13 13:13:10 UTC (rev 199470)
@@ -1,3 +1,16 @@
+2016-03-31 Yusuke Suzuki <[email protected]>
+
+ Fails to build in Linux / PowerPC due to different ucontext_t definition
+ https://bugs.webkit.org/show_bug.cgi?id=156015
+
+ Reviewed by Michael Catanzaro.
+
+ PPC does not have mcontext_t in ucontext_t::uc_mcontext.
+ So we take the special way to retrieve mcontext_t in PPC.
+
+ * heap/MachineStackMarker.cpp:
+ (pthreadSignalHandlerSuspendResume):
+
2016-03-30 Saam Barati <[email protected]>
Change some release asserts in CodeBlock linking into debug asserts
Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/heap/MachineStackMarker.cpp (199469 => 199470)
--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/heap/MachineStackMarker.cpp 2016-04-13 13:12:06 UTC (rev 199469)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/heap/MachineStackMarker.cpp 2016-04-13 13:13:10 UTC (rev 199470)
@@ -86,7 +86,11 @@
}
ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
+#if CPU(PPC)
+ thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
+#else
thread->suspendedMachineContext = userContext->uc_mcontext;
+#endif
// Allow suspend caller to see that this thread is suspended.
// sem_post is async-signal-safe function. It means that we can call this from a signal handler.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
