rpms/webkitgtk/devel webkit-1.1.11-atomic-word.patch, NONE, 1.1 webkitgtk.spec, 1.11, 1.12 webkit-1.1.8-atomic-word.patch, 1.2, NONE

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15288

Modified Files:
	webkitgtk.spec 
Added Files:
	webkit-1.1.11-atomic-word.patch 
Removed Files:
	webkit-1.1.8-atomic-word.patch 
Log Message:
update the attomic word patch for webkit 1.1.11


webkit-1.1.11-atomic-word.patch:

--- NEW FILE webkit-1.1.11-atomic-word.patch ---
--- webkit-1.1.11/JavaScriptCore/wtf/Platform.h.orig	2009-07-14 13:01:51.000000000 -0500
+++ webkit-1.1.11/JavaScriptCore/wtf/Platform.h	2009-07-14 13:04:59.000000000 -0500
@@ -272,9 +272,16 @@
 #endif
 
 /* PLATFORM(SPARC64) */
-#if defined(__sparc64__)
+#if defined(__sparc64__)\
+    || defined(__sparc__) && defined(_arch64__)
 #define WTF_PLATFORM_SPARC64 1
 #define WTF_PLATFORM_BIG_ENDIAN 1
+#else
+/* PLATFORM(SPARC) */
+#if defined(__sparc__)
+#define WTF_PLATFORM_SPARC 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
 #endif
 
 /* PLATFORM(WINCE) && PLATFORM(QT)
diff -uNr webkit-1.1.8-orig/JavaScriptCore/wtf/Threading.h webkit-1.1.8/JavaScriptCore/wtf/Threading.h
--- webkit-1.1.8-orig/JavaScriptCore/wtf/Threading.h	2009-05-14 10:25:19.000000000 -0500
+++ webkit-1.1.8/JavaScriptCore/wtf/Threading.h	2009-06-13 12:59:06.000000000 -0500
@@ -207,14 +207,14 @@
 #elif COMPILER(GCC)
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 
-inline void atomicIncrement(int volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
-inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
+inline void atomicIncrement(_Atomic_word volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
+inline _Atomic_word atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
 
 #endif
 
 class ThreadSafeSharedBase : Noncopyable {
 public:
-    ThreadSafeSharedBase(int initialRefCount = 1)
+    ThreadSafeSharedBase(_Atomic_word initialRefCount = 1)
         : m_refCount(initialRefCount)
     {
     }
@@ -234,12 +234,12 @@
         return refCount() == 1;
     }
 
-    int refCount() const
+    _Atomic_word refCount() const
     {
 #if !USE(LOCKFREE_THREADSAFESHARED)
         MutexLocker locker(m_mutex);
 #endif
-        return static_cast<int const volatile &>(m_refCount);
+        return static_cast<_Atomic_word const volatile &>(m_refCount);
     }
 
 protected:
@@ -266,7 +266,7 @@
     template<class T>
     friend class CrossThreadRefCounted;
 
-    int m_refCount;
+    _Atomic_word m_refCount;
 #if !USE(LOCKFREE_THREADSAFESHARED)
     mutable Mutex m_mutex;
 #endif
@@ -274,7 +274,7 @@
 
 template<class T> class ThreadSafeShared : public ThreadSafeSharedBase {
 public:
-    ThreadSafeShared(int initialRefCount = 1)
+    ThreadSafeShared(_Atomic_word initialRefCount = 1)
         : ThreadSafeSharedBase(initialRefCount)
     {
     }


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- webkitgtk.spec	14 Jul 2009 17:46:03 -0000	1.11
+++ webkitgtk.spec	14 Jul 2009 18:23:45 -0000	1.12
@@ -46,7 +46,7 @@ License:	LGPLv2+ and BSD
 URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
-Patch0:         webkit-1.1.8-atomic-word.patch
+Patch0:         webkit-1.1.11-atomic-word.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 


--- webkit-1.1.8-atomic-word.patch DELETED ---