[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Thu Apr 8 01:14:49 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b1f81fd2fbfe7312cf863ad27c7c4121bf11a9ee
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 19 19:48:36 2010 +0000
2010-01-19 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Unreviewed build fix for JIT with RVCT.
Remove IMPORT statement; cti_vm_throw is already defined in JITStubs.h.
Remove extra ')'.
* jit/JITStubs.cpp:
(JSC::ctiVMThrowTrampoline):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e76a545..75c3eaa 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-19 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Unreviewed build fix for JIT with RVCT.
+
+ Remove IMPORT statement; cti_vm_throw is already defined in JITStubs.h.
+ Remove extra ')'.
+
+ * jit/JITStubs.cpp:
+ (JSC::ctiVMThrowTrampoline):
+
2010-01-19 Geoffrey Garen <ggaren at apple.com>
Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp
index bcab628..6f07934 100644
--- a/JavaScriptCore/jit/JITStubs.cpp
+++ b/JavaScriptCore/jit/JITStubs.cpp
@@ -663,7 +663,6 @@ __asm void ctiVMThrowTrampoline()
{
ARM
PRESERVE8
- IMPORT cti_vm_throw
mov r0, sp
bl cti_vm_throw
add sp, sp, #36
@@ -1074,7 +1073,7 @@ RVCT( IMPORT JITStubThunked_#op#)
RVCT( str lr, [sp, #32])
RVCT( bl JITStubThunked_#op#)
RVCT( ldr lr, [sp, #32])
-RVCT( bx lr))
+RVCT( bx lr)
RVCT(})
RVCT()
*/
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list