blob: af6d467e232a7da9d0c0eeb11a47eb0ab3a533c8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 7960c437511c650ad33708f4e42457118d95a13d Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Sun, 19 Oct 2014 19:43:09 +0200
Subject: [PATCH 4/4] Do not use std::atomic on PPC
$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
https://bugs.webkit.org/show_bug.cgi?id=130837
---
Source/WebKit2/Platform/IPC/Connection.h | 4 ++++
Source/WebKit2/UIProcess/StatisticsRequest.cpp | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/Source/WebKit2/Platform/IPC/Connection.h b/Source/WebKit2/Platform/IPC/Connection.h
index b52cf1e..5597e94 100644
--- a/Source/WebKit2/Platform/IPC/Connection.h
+++ b/Source/WebKit2/Platform/IPC/Connection.h
@@ -233,7 +233,11 @@ private:
Client* m_client;
bool m_isServer;
+#if CPU(PPC)
+ uint64_t m_syncRequestID;
+#else
std::atomic<uint64_t> m_syncRequestID;
+#endif
bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
bool m_shouldExitOnSyncMessageSendFailure;
diff --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
index bc0a1e6..ef259d1 100644
--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp
+++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
uint64_t StatisticsRequest::addOutstandingRequest()
{
+#if CPU(PPC)
+ static int64_t uniqueRequestID;
+#else
static std::atomic<int64_t> uniqueRequestID;
+#endif
uint64_t requestID = ++uniqueRequestID;
m_outstandingRequests.add(requestID);
--
2.1.2
|
GitWeb
