summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-11-02 02:12:35 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-11-02 02:12:35 +0800
commitbe1de00752978993d54e5516f46368253d95d588 (patch)
tree91479c563a753bc438d6c70ca381eaa3309a5a55
parent91ba08bcfd543891295133509cf22efb533aee75 (diff)
downloadmarcuscom-ports-be1de00752978993d54e5516f46368253d95d588.tar
marcuscom-ports-be1de00752978993d54e5516f46368253d95d588.tar.gz
marcuscom-ports-be1de00752978993d54e5516f46368253d95d588.tar.bz2
marcuscom-ports-be1de00752978993d54e5516f46368253d95d588.tar.lz
marcuscom-ports-be1de00752978993d54e5516f46368253d95d588.tar.xz
marcuscom-ports-be1de00752978993d54e5516f46368253d95d588.tar.zst
marcuscom-ports-be1de00752978993d54e5516f46368253d95d588.zip
Fix the build on 6.X on amd64.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13197 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp13
1 files changed, 11 insertions, 2 deletions
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<void*>(ctiVMThrowTrampoline)), regT2);
++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2);
+ emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
+ poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*));
+ restoreReturnAddressBeforeReturn(regT2);