[webkitgtk3] Update to 1.11.91
Tomas Popela
tpopela at fedoraproject.org
Fri Mar 8 13:56:45 UTC 2013
commit 4ecf58560910aece2714e07a8671ba9711aae50b
Author: Tomas Popela <tpopela at redhat.com>
Date: Fri Mar 8 14:55:11 2013 +0100
Update to 1.11.91
Fix for RH bug #915990 - Seed segfaults in JSC::LLInt::CLoop::execute()
.gitignore | 1 +
sources | 2 +-
webkit-1.11.2-Double2Ints.patch | 15 +++++------
webkit-1.11.90-double2intsPPC32.patch | 40 +++++++++++++++++++++++++++++++++
webkitgtk3.spec | 14 ++++++++---
5 files changed, 59 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffdd21e..a21a0de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ webkit-1.3.3.tar.gz
/webkitgtk-1.11.4.tar.xz
/webkitgtk-1.11.5.tar.xz
/webkitgtk-1.11.90.tar.xz
+/webkitgtk-1.11.91.tar.xz
diff --git a/sources b/sources
index fd0b54b..487bf4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb6aff2fa84bdedcf94c34c950dc0a51 webkitgtk-1.11.90.tar.xz
+01ede85baaac85c6eb065a2e121bc9d4 webkitgtk-1.11.91.tar.xz
diff --git a/webkit-1.11.2-Double2Ints.patch b/webkit-1.11.2-Double2Ints.patch
index c602985..3371964 100644
--- a/webkit-1.11.2-Double2Ints.patch
+++ b/webkit-1.11.2-Double2Ints.patch
@@ -1,21 +1,20 @@
-Index: Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-===================================================================
---- webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Revision 137796)
-+++ webkitgtk-1.11.2/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (Arbeitskopie)
-@@ -116,6 +116,17 @@
+diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints 2013-02-12 17:22:38.000000000 +0100
++++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-03-07 18:04:39.778807991 +0100
+@@ -117,6 +118,17 @@ static double Ints2Double(uint32_t lo, u
u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
return u.dval;
}
+
-+static void Double2Ints(double input, intptr_t lo, intptr_t hi)
++static void Double2Ints(double input, intptr_t& lo, intptr_t& hi)
+{
+ union {
+ double dval;
+ int64_t ival64;
+ } u;
+ u.dval = input;
-+ *(reinterpret_cast<int32_t*>(hi)) = static_cast<int32_t>(u.ival64 >> 32);
-+ *(reinterpret_cast<int32_t*>(lo)) = static_cast<int32_t>(u.ival64);
++ hi = static_cast<intptr_t>(u.ival64 >> 32);
++ lo = static_cast<intptr_t>(u.ival64);
+}
#endif // USE(JSVALUE32_64)
diff --git a/webkit-1.11.90-double2intsPPC32.patch b/webkit-1.11.90-double2intsPPC32.patch
new file mode 100644
index 0000000..be35493
--- /dev/null
+++ b/webkit-1.11.90-double2intsPPC32.patch
@@ -0,0 +1,40 @@
+diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-03-07 17:55:22.488831605 +0100
++++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-03-07 17:56:04.998829804 +0100
+@@ -1729,7 +1729,7 @@ _llint_op_next_pname:
+ loadi 20[PC], t2
+ loadi PayloadOffset[cfr, t2, 8], t2
+ loadp JSPropertyNameIterator::m_jsStrings[t2], t3
+- loadi [t3, t0, 8], t3
++ loadi PayloadOffset[t3, t0, 8], t3
+ addi 1, t0
+ storei t0, PayloadOffset[cfr, t1, 8]
+ loadi 4[PC], t1
+diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-03-07 17:56:24.953828958 +0100
++++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-03-07 17:58:05.653824691 +0100
+@@ -263,13 +263,13 @@ macro assertNotConstant(index)
+ end
+
+ macro functionForCallCodeBlockGetter(targetRegister)
+- loadp Callee[cfr], targetRegister
++ loadp Callee + PayloadOffset[cfr], targetRegister
+ loadp JSFunction::m_executable[targetRegister], targetRegister
+ loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
+ end
+
+ macro functionForConstructCodeBlockGetter(targetRegister)
+- loadp Callee[cfr], targetRegister
++ loadp Callee + PayloadOffset[cfr], targetRegister
+ loadp JSFunction::m_executable[targetRegister], targetRegister
+ loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
+ end
+@@ -824,7 +824,7 @@ macro interpretResolveWithBase(opcodeLen
+ getResolveOperation(4, t0)
+ btpz t0, .slowPath
+
+- loadp ScopeChain[cfr], t3
++ loadp ScopeChain + PayloadOffset[cfr], t3
+ # Get the base
+ loadis ResolveOperation::m_operation[t0], t2
+
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 8d2b13b..a14af33 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk3
-Version: 1.11.90
-Release: 3%{?dist}
+Version: 1.11.91
+Release: 1%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@@ -25,7 +25,8 @@ Patch4: webkit-1.11.2-yarr.patch
Patch5: webkit-1.11.2-includes.patch
# https://bugs.webkit.org/show_bug.cgi?id=103128
Patch6: webkit-1.11.2-Double2Ints.patch
-Patch10: webkitgtk-1.11.5-libatomic.patch
+Patch7: webkitgtk-1.11.5-libatomic.patch
+Patch8: webkit-1.11.90-double2intsPPC32.patch
BuildRequires: bison
BuildRequires: cairo-devel
@@ -97,7 +98,8 @@ This package contains developer documentation for %{name}.
%patch5 -p1 -b .includes
%patch6 -p1 -b .double2ints
%ifarch ppc
-%patch10 -p1 -b .libatomic
+%patch7 -p1 -b .libatomic
+%patch8 -p1 -b .double2intsPPC32
%endif
%build
@@ -220,6 +222,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
+* Fri Mar 08 2013 Tomas Popela <tpopela at redhat.com> 1.11.91-1
+- Update to 1.11.91
+- Fix for RH bug #915990 - Seed segfaults in JSC::LLInt::CLoop::execute()
+
* Mon Feb 25 2013 Tomas Popela <tpopela at redhat.com> 1.11.90-3
- Fix for not building on ppc32 with JIT disabled
More information about the scm-commits
mailing list