On Mon, Jan 04, 2010 at 06:37:36AM +0300, Andrej Elizarov wrote: > while compiling webkit-1.1.15.4v0 from current ports on 4.6-stable i still > need > patch-JavaScriptCore_jit_JITStubs_cpp . > here it is. it just works for me.
Which arch ? Iirc this patch was needed only on amd64, and not needed anymore since 1.1.15.2 and after which builds fine with -current, otherwise i suppose i would have get some complains since then... Providing an error message, a compiler version, etc... could be useful. (if we cared about ppl building current ports on stable....) You can also comment on https://bugs.webkit.org/show_bug.cgi?id=26099 > --- JavaScriptCore/jit/JITStubs.cpp.orig Mon Jan 4 06:03:57 2010 > +++ JavaScriptCore/jit/JITStubs.cpp Mon Jan 4 06:17:10 2010 > @@ -81,10 +81,10 @@ > > // These ASSERTs remind you that, if you change the layout of > JITStackFrame, you > // need to change the assembly trampolines below to match. > -COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 16 == 0x0, > JITStackFrame_maintains_16byte_stack_alignment); > -COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, > JITStackFrame_stub_argument_space_matches_ctiTrampoline); > -COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, > JITStackFrame_callFrame_offset_matches_ctiTrampoline); > -COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, > JITStackFrame_code_offset_matches_ctiTrampoline); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 16 == 0x0, > JITStackFrame_maintains_16byte_stack_alignment); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, > JITStackFrame_stub_argument_space_matches_ctiTrampoline); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, > JITStackFrame_callFrame_offset_matches_ctiTrampoline); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, > JITStackFrame_code_offset_matches_ctiTrampoline); > > asm volatile ( > ".globl " SYMBOL_STRING(ctiTrampoline) "\n" > @@ -140,10 +140,10 @@ > > // These ASSERTs remind you that, if you change the layout of > JITStackFrame, you > // need to change the assembly trampolines below to match. > -COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 32 == 0x0, > JITStackFrame_maintains_32byte_stack_alignment); > -COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, > JITStackFrame_stub_argument_space_matches_ctiTrampoline); > -COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, > JITStackFrame_callFrame_offset_matches_ctiTrampoline); > -COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, > JITStackFrame_code_offset_matches_ctiTrampoline); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 32 == 0x0, > JITStackFrame_maintains_32byte_stack_alignment); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, > JITStackFrame_stub_argument_space_matches_ctiTrampoline); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, > JITStackFrame_callFrame_offset_matches_ctiTrampoline); > +//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, > JITStackFrame_code_offset_matches_ctiTrampoline); > > asm volatile ( > ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
