File qt-4.6.0-javascriptcore.patch of Package mingw32-libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File qt-4.6.0-javascriptcore.patch of Package mingw32-libqt4 (Revision e7e2938e83a5faf44686f20f98f3d936)

Currently displaying revision e7e2938e83a5faf44686f20f98f3d936 , Show latest

--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	(revision 52306)
+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp	(working copy)
@@ -91,6 +91,13 @@
 
 #define COLLECT_ON_EVERY_ALLOCATION 0
 
+#if defined(__MINGW64_VERSION_MAJOR)
+extern "C" {
+void * __mingw_aligned_malloc (size_t, size_t);
+void __mingw_aligned_free (void *);
+}
+#endif
+
 using std::max;
 
 namespace JSC {
@@ -548,7 +548,7 @@
         MOV pTib, EAX
     }
     return static_cast<void*>(pTib->StackBase);
-#elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#elif PLATFORM(WIN_OS) && PLATFORM(X86_64)
     PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
     return reinterpret_cast<void*>(pTib->StackBase);
 #elif PLATFORM(WIN_OS) && PLATFORM(X86) && COMPILER(GCC)
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h	(revision 52306)
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h	(working copy)
@@ -51,6 +51,8 @@
 #include <windows.h>
 #endif
 
+#include <wtf/Assertions.h>
+
 namespace WTF {
 
 #if !USE(PTHREADS) && !PLATFORM(QT) && PLATFORM(WIN_OS)
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/OwnPtr.h	(revision 52306)
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/OwnPtr.h	(working copy)
@@ -28,6 +28,19 @@
 #include <algorithm>
 #include <memory>
 
+#if PLATFORM(WIN)
+
+#include <WebCore/plugins/win/PluginMessageThrottlerWin.h>
+
+typedef struct HBITMAP__* HBITMAP;
+typedef struct HBRUSH__* HBRUSH;
+typedef struct HFONT__* HFONT;
+typedef struct HPALETTE__* HPALETTE;
+typedef struct HPEN__* HPEN;
+typedef struct HRGN__* HRGN;
+
+#endif
+
 namespace WTF {
 
     // Unlike most of our smart pointers, OwnPtr can take either the pointer type or the pointed-to type.
--- src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.cpp	(revision 52306)
+++ src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.cpp	(working copy)
@@ -36,7 +36,7 @@
 JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
 {
     initializeThreading();
-    return OpaqueJSString::create(chars, numChars).releaseRef();
+    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).releaseRef();
 }
 
 JSStringRef JSStringCreateWithUTF8CString(const char* string)
@@ -72,7 +72,7 @@
 
 const JSChar* JSStringGetCharactersPtr(JSStringRef string)
 {
-    return string->characters();
+    return reinterpret_cast<const JSChar*>(string->characters());
 }
 
 size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
--- src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h	(revision 52306)
+++ src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h	(working copy)
@@ -100,7 +100,7 @@
         ReturnAddressPtr* returnAddressSlot() { return reinterpret_cast<ReturnAddressPtr*>(this) - 1; }
     };
 #elif PLATFORM(X86)
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) || (PLATFORM(WIN_OS) && COMPILER(GCC))
 #pragma pack(push)
 #pragma pack(4)
 #endif // COMPILER(MSVC)
@@ -127,7 +127,7 @@
         // When JIT code makes a call, it pushes its return address just below the rest of the stack.
         ReturnAddressPtr* returnAddressSlot() { return reinterpret_cast<ReturnAddressPtr*>(this) - 1; }
     };
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) || (PLATFORM(WIN_OS) && COMPILER(GCC))
 #pragma pack(pop)
 #endif // COMPILER(MSVC)
 #elif PLATFORM(ARM_THUMB2)
--- src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.h	(revision 52306)
+++ src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.h	(working copy)
@@ -243,7 +243,7 @@
 inline ExecutablePool::ExecutablePool(size_t n)
 {
     size_t allocSize = roundUpAllocationSize(n, JIT_ALLOCATOR_PAGE_SIZE);
-    Allocation mem = systemAlloc(allocSize);
+    const Allocation mem = systemAlloc(allocSize);
     m_pools.append(mem);
     m_freePtr = mem.pages;
     if (!m_freePtr)

Places

File qt-4.6.0-javascriptcore.patch of Package mingw32-libqt4 (Revision e7e2938e83a5faf44686f20f98f3d936)

Places