[webkitgtk3] Added fixes for building webkitgtk with JIT disabled
Tomas Popela
tpopela at fedoraproject.org
Mon Feb 18 16:07:08 UTC 2013
commit 5f96013cbb0272abe3b560a9b67eb55872961676
Author: Tomas Popela <tpopela at redhat.com>
Date: Mon Feb 18 17:06:22 2013 +0100
Added fixes for building webkitgtk with JIT disabled
webkitgtk-1.11.5-JSCJSValueFix.patch | 11 +++
webkitgtk-1.11.5-ppcFetch8Fix.patch | 128 ++++++++++++++++++++++++++++++++++
webkitgtk3.spec | 16 ++++-
3 files changed, 153 insertions(+), 2 deletions(-)
---
diff --git a/webkitgtk-1.11.5-JSCJSValueFix.patch b/webkitgtk-1.11.5-JSCJSValueFix.patch
new file mode 100644
index 0000000..62156f4
--- /dev/null
+++ b/webkitgtk-1.11.5-JSCJSValueFix.patch
@@ -0,0 +1,11 @@
+diff -up webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.JSCJSValueFix webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+--- webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.JSCJSValueFix 2013-02-15 11:26:57.432824944 +0100
++++ webkitgtk-1.11.5/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-02-15 11:24:00.320680911 +0100
+@@ -35,6 +35,7 @@
+ #include "CodeBlock.h"
+ #include "LLIntCLoop.h"
+ #include "LLIntSlowPaths.h"
++#include "Operations.h"
+ #include "VMInspector.h"
+ #include <wtf/Assertions.h>
+ #include <wtf/MathExtras.h>
diff --git a/webkitgtk-1.11.5-ppcFetch8Fix.patch b/webkitgtk-1.11.5-ppcFetch8Fix.patch
new file mode 100644
index 0000000..9b80923
--- /dev/null
+++ b/webkitgtk-1.11.5-ppcFetch8Fix.patch
@@ -0,0 +1,128 @@
+diff --git a/Source/WTF/GNUmakefile.list.am b/Source/WTF/GNUmakefile.list.am
+index 0c01579..0408450 100644
+--- a/Source/WTF/GNUmakefile.list.am
++++ b/Source/WTF/GNUmakefile.list.am
+@@ -12,6 +12,7 @@ wtf_sources += \
+ Source/WTF/wtf/Assertions.cpp \
+ Source/WTF/wtf/Assertions.h \
+ Source/WTF/wtf/Atomics.h \
++ Source/WTF/wtf/Atomics.cpp \
+ Source/WTF/wtf/BitArray.h \
+ Source/WTF/wtf/BitVector.cpp \
+ Source/WTF/wtf/BitVector.h \
+diff --git a/Source/WTF/wtf/Atomics.cpp b/Source/WTF/wtf/Atomics.cpp
+new file mode 100644
+index 0000000..0feea15
+--- /dev/null
++++ b/Source/WTF/wtf/Atomics.cpp
+@@ -0,0 +1,110 @@
++/*
++ * Copyright (C) 2007, 2008, 2010, 2012 Apple Inc. All rights reserved.
++ * Copyright (C) 2007 Justin Haygood (jhaygood at reaktix.com)
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
++ * its contributors may be used to endorse or promote products derived
++ * from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
++ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ *
++ * Note: The implementations of InterlockedIncrement and InterlockedDecrement are based
++ * on atomic_increment and atomic_exchange_and_add from the Boost C++ Library. The license
++ * is virtually identical to the Apple license above but is included here for completeness.
++ *
++ * Boost Software License - Version 1.0 - August 17th, 2003
++ *
++ * Permission is hereby granted, free of charge, to any person or organization
++ * obtaining a copy of the software and accompanying documentation covered by
++ * this license (the "Software") to use, reproduce, display, distribute,
++ * execute, and transmit the Software, and to prepare derivative works of the
++ * Software, and to permit third-parties to whom the Software is furnished to
++ * do so, all subject to the following:
++ *
++ * The copyright notices in the Software and this entire statement, including
++ * the above license grant, this restriction and the following disclaimer,
++ * must be included in all copies of the Software, in whole or in part, and
++ * all derivative works of the Software, unless such copies or derivative
++ * works are solely in the form of machine-executable object code generated by
++ * a source language processor.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
++ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
++ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ */
++
++#include "config.h"
++#include "Atomics.h"
++
++// Some architectures, like MIPS32, don't have GCC implementation for builtin __sync_* functions
++// with 64 bits variable size. Official GCC answer for the problem: If a target doesn't support
++// atomic operations on certain variable sizes, you are out of luck with atomicity in that case
++// (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56296). GCC >= 4.8 will support __atomic_* builtin
++// functions for this purpose for all the GCC targets, but for current compilers we have to include
++// our own implementation.
++#if COMPILER(GCC) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && USE(LOCKFREE_THREADSAFEREFCOUNTED) && USE(PTHREADS)
++
++#include "ThreadingPrimitives.h"
++
++namespace WTF {
++
++static const size_t kSwapLockCount = 32;
++static Mutex s_swapLocks[kSwapLockCount];
++
++static inline Mutex& getSwapLock(const volatile int64_t* addr)
++{
++ return s_swapLocks[(reinterpret_cast<intptr_t>(addr) >> 3U) % kSwapLockCount];
++}
++
++static int64_t atomicStep(int64_t volatile* addend, int64_t step)
++{
++ Mutex& mutex = getSwapLock(addend);
++
++ mutex.lock();
++ int64_t value = *addend + step;
++ *addend = value;
++ mutex.unlock();
++
++ return value;
++}
++
++extern "C" {
++
++int64_t __sync_add_and_fetch_8(int64_t volatile* addend, int64_t value)
++{
++ return atomicStep(addend, value);
++}
++
++int64_t __sync_sub_and_fetch_8(int64_t volatile* addend, int64_t value)
++{
++ return atomicStep(addend, -value);
++}
++
++} // extern "C"
++
++} // namespace WTF
++
++#endif
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 84f5640..bedd9c0 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
Name: webkitgtk3
Version: 1.11.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -29,6 +29,9 @@ Patch6: webkit-1.11.2-Double2Ints.patch
Patch7: webkitgtk-1.11.5-i686-linking.patch
# https://bugs.webkit.org/show_bug.cgi?id=106903
Patch8: webkitgtk-1.11.5-atkFix.patch
+# Fix for not building with JIT disabled
+Patch9: webkitgtk-1.11.5-JSCJSValueFix.patch
+Patch10: webkitgtk-1.11.5-ppcFetch8Fix.patch
BuildRequires: bison
BuildRequires: cairo-devel
@@ -97,7 +100,8 @@ This package contains developer documentation for %{name}.
%patch6 -p1 -b .double2ints
%patch7 -p1 -b .i686
%patch8 -p1 -b .atkFix
-
+%patch9 -p1 -b .JSCJSValueFix
+%patch10 -p1 -b .ppcFetch8Fix
%build
%ifarch s390 %{arm} ppc
@@ -109,6 +113,11 @@ This package contains developer documentation for %{name}.
%global optflags %(echo %{optflags} | sed 's/-g/-g1/')
%endif
+%ifarch ppc
+# Use linker flag -relax to get WebKit2 build under ppc(32) with JIT disabled
+%global optflags %{optflags} -Wl,-relax
+%endif
+
# Build with -g1 on all platforms to avoid running into 4 GB ar format limit
# https://bugs.webkit.org/show_bug.cgi?id=91154
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
@@ -215,6 +224,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
+* Mon Feb 18 2013 Tomas Popela <tpopela at redhat.com> 1.11.5-4
+- Backported fixes for not building with disabled JIT
+
* Sat Feb 16 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.11.5-3
- Re-enable JIT on ARM (hopefully the gmail crash is fixed)
More information about the scm-commits
mailing list