Changeset 55453 in webkit for trunk/JavaScriptCore/runtime/Collector.cpp

Timestamp:

Mar 3, 2010, 12:07:47 AM (15 years ago)

Author:

[email protected]

Message:

2010-03-02 Fridrich Strba <​[email protected]>

Reviewed by Oliver Hunt.

Allow building smoothly on win32 and win64 using GCC
​https://bugs.webkit.org/show_bug.cgi?id=35607

• jit/JITStubs.h:
• runtime/Collector.cpp: (JSC::Heap::allocateBlock): (JSC::Heap::freeBlockPtr): (JSC::currentThreadStackBase):

File:

• trunk/JavaScriptCore/runtime/Collector.cpp (modified) (4 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -230 +230 @@
     void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #elif OS(WINDOWS)
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
     void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
 #else
@@ -321 +321 @@
     VirtualFree(block, 0, MEM_RELEASE);
 #elif OS(WINDOWS)
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
     __mingw_aligned_free(block);
 #else
@@ -575 +575 @@
     }
     return static_cast<void*>(pTib->StackBase);
-#elif OS(WINDOWS) && CPU(X86_64) && COMPILER(MSVC)
-    // FIXME: why only for MSVC?
-    PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
-    return reinterpret_cast<void*>(pTib->StackBase);
 #elif OS(WINDOWS) && CPU(X86) && COMPILER(GCC)
     // offset 0x18 from the FS segment register gives a pointer to
@@ -587 +583 @@
         );
     return static_cast<void*>(pTib->StackBase);
+#elif OS(WINDOWS) && CPU(X86_64)
+    PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
+    return reinterpret_cast<void*>(pTib->StackBase);
 #elif OS(QNX)
     return currentThreadStackBaseQNX();