From be1de00752978993d54e5516f46368253d95d588 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 1 Nov 2009 18:12:35 +0000 Subject: Fix the build on 6.X on amd64. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13197 df743ca5-7f9a-e211-a948-0013205c9059 --- .../files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'www/webkit-gtk2/files') diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp index 2c688da5a..6e6ffe831 100644 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp @@ -1,5 +1,5 @@ ---- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-10-19 08:35:41.000000000 -0400 -+++ JavaScriptCore/jit/JITOpcodes.cpp 2009-10-19 08:36:09.000000000 -0400 +--- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-09-29 15:43:18.000000000 -0400 ++++ JavaScriptCore/jit/JITOpcodes.cpp 2009-11-01 13:09:39.000000000 -0500 @@ -270,7 +270,7 @@ void JIT::privateCompileCTIMachineTrampo emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); move(ImmPtr(&globalData->exceptionLocation), regT2); @@ -9,3 +9,12 @@ emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); restoreReturnAddressBeforeReturn(regT2); +@@ -1754,7 +1754,7 @@ void JIT::privateCompileCTIMachineTrampo + emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); + move(ImmPtr(&globalData->exceptionLocation), regT2); + storePtr(regT1, regT2); +- move(ImmPtr(reinterpret_cast(ctiVMThrowTrampoline)), regT2); ++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); + emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); + poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); + restoreReturnAddressBeforeReturn(regT2); -- cgit v1.2.3