Title: [94927] trunk/Source/_javascript_Core
- Revision
- 94927
- Author
- [email protected]
- Date
- 2011-09-11 11:34:02 -0700 (Sun, 11 Sep 2011)
Log Message
[Qt] Win32 build broken due to MachineStackMarker.cpp/.o failing to link against pthreads library
https://bugs.webkit.org/show_bug.cgi?id=67864
Qt Win32 is not pthread compatible and cannot participate in multithreaded JSC or it fails to build.
Patch by Jarred Nicholls <[email protected]> on 2011-09-11
Reviewed by Csaba Osztrogonác.
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94926 => 94927)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-11 17:21:53 UTC (rev 94926)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-11 18:34:02 UTC (rev 94927)
@@ -1,3 +1,14 @@
+2011-09-11 Jarred Nicholls <[email protected]>
+
+ [Qt] Win32 build broken due to MachineStackMarker.cpp/.o failing to link against pthreads library
+ https://bugs.webkit.org/show_bug.cgi?id=67864
+
+ Qt Win32 is not pthread compatible and cannot participate in multithreaded JSC or it fails to build.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * wtf/Platform.h:
+
2011-09-11 Filip Pizlo <[email protected]>
ARM and MIPS assemblers still refer to executable pools.
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (94926 => 94927)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-09-11 17:21:53 UTC (rev 94926)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-09-11 18:34:02 UTC (rev 94927)
@@ -509,11 +509,15 @@
#define WTF_USE_PTHREAD_BASED_QT 1
#endif
-#if !defined(ENABLE_JSC_MULTIPLE_THREADS)
+/* FIXME: JSC multithreading currently only supports pthread.
+ Qt-Win cannot do multithreading because it is not pthread-based. */
+#if !defined(ENABLE_JSC_MULTIPLE_THREADS) && (!PLATFORM(QT) || USE(PTHREAD_BASED_QT))
#define ENABLE_JSC_MULTIPLE_THREADS 1
#endif
-#if !defined(ENABLE_WTF_MULTIPLE_THREADS)
+/* FIXME: JSC multithreading currently only supports pthread.
+ Qt-Win cannot do multithreading because it is not pthread-based. */
+#if !defined(ENABLE_WTF_MULTIPLE_THREADS) && (!PLATFORM(QT) || USE(PTHREAD_BASED_QT))
#define ENABLE_WTF_MULTIPLE_THREADS 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
