Changeset 48300 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 11, 2009, 6:29:25 AM (16 years ago)

Author:

[email protected]

Message:

2009-09-11 Jocelyn Turcotte <​[email protected]>

Reviewed by Simon Hausmann.

Compiling JavaScriptCore on sparc 64 with gcc fails.

ThreadSafeShared uses the atomic gnu_cxx::exchange_and_add with an int,
however on sparc 64 the _Atomic_word argument is typedefed to long (8 bytes).

The patch disables WTF_USE_LOCKFREE_THREADSAFESHARED in ThreadSafeShared to use
a mutex instead when compiling for sparc 64 with gcc.

​https://bugs.webkit.org/show_bug.cgi?id=29175

• wtf/Platform.h: sparc64 is not defined on all OS.

Uses instead: sparc && arch64

sparcv9

• wtf/Threading.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)
• wtf/Threading.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-09-11  Jocelyn Turcotte  <[email protected]>
+
+        Reviewed by Simon Hausmann.
+
+        Compiling JavaScriptCore on sparc 64 with gcc fails.
+
+        ThreadSafeShared uses the atomic __gnu_cxx::__exchange_and_add with an int,
+        however on sparc 64 the _Atomic_word argument is typedefed to long (8 bytes).
+
+        The patch disables WTF_USE_LOCKFREE_THREADSAFESHARED in ThreadSafeShared to use
+        a mutex instead when compiling for sparc 64 with gcc.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29175
+
+        * wtf/Platform.h:
+        __sparc64__ is not defined on all OS.
+        Uses instead: __sparc__ && __arch64__ || __sparcv9
+        * wtf/Threading.h:
+
 2009-09-11  Prasanth Ullattil  <[email protected]>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -280 +280 @@
 
 /* PLATFORM(SPARC64) */
-#if defined(__sparc64__)
+#if defined(__sparc__) && defined(__arch64__) || defined (__sparcv9)
 #define WTF_PLATFORM_SPARC64 1
 #define WTF_PLATFORM_BIG_ENDIAN 1

trunk/JavaScriptCore/wtf/Threading.h

@@ -229 +229 @@
 inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }
 
-#elif COMPILER(GCC)
+#elif COMPILER(GCC) && !PLATFORM(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1