diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-10-19 20:38:18 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-10-19 20:38:18 +0800 |
| commit | eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7 (patch) | |
| tree | 2ffb773a6f70dd21e5ffc3a76f470d839a7dd144 | |
| parent | ef7ab0255bbe243ef545ef687d63b23d587b70e0 (diff) | |
| download | marcuscom-ports-eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7.tar marcuscom-ports-eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7.tar.gz marcuscom-ports-eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7.tar.bz2 marcuscom-ports-eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7.tar.lz marcuscom-ports-eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7.tar.xz marcuscom-ports-eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7.tar.zst marcuscom-ports-eed8b3bb86be2f6bded662d5dc5abfc9287f0cb7.zip | |
Add some more 6.X build fixes.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13138 df743ca5-7f9a-e211-a948-0013205c9059
3 files changed, 26 insertions, 2 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 956932ce6..8cc141f46 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.44 2009/10/10 03:51:56 marcus Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.45 2009/10/18 17:47:51 marcus Exp $ # PORTNAME= webkit @@ -70,7 +70,9 @@ PLIST_SUB+= STATIC="@comment " .if ${OSVERSION} < 700000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \ - ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h + ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h \ + ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp \ + ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h .endif post-patch: diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h new file mode 100644 index 000000000..dc03dce02 --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h @@ -0,0 +1,11 @@ +--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2009-10-19 08:34:08.000000000 -0400 ++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2009-10-19 08:34:53.000000000 -0400 +@@ -69,7 +69,7 @@ public: + + template<typename FunctionType> + explicit FunctionPtr(FunctionType* value) +- : m_value(reinterpret_cast<void*>(value)) ++ : m_value((void*)(value)) + { + ASSERT_VALID_CODE_POINTER(m_value); + } diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp new file mode 100644 index 000000000..2c688da5a --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp @@ -0,0 +1,11 @@ +--- 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 +@@ -270,7 +270,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); |