Bug 119879 – [sh4] Fix sh4 build after r154156

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Julien Brianceau]

sh4 build is broken since r154156:

/local/wkit/slavebuildbot_LOCAL/workspace_LOCAL/qt-linux-sh4-release/build/WebKitBuild/Release/Source/JavaScriptCore/release/libJavaScriptCore.a(JITArithmetic32_64.o): In function `JSC::JITSlowPathCall::call()':
JITArithmetic32_64.cpp:(.text._ZN3JSC15JITSlowPathCall4callEv[JSC::JITSlowPathCall::call()]+0x240): undefined reference to `ctiVMHandleException'
/local/wkit/slavebuildbot_LOCAL/workspace_LOCAL/qt-linux-sh4-release/build/WebKitBuild/Release/Source/JavaScriptCore/release/libJavaScriptCore.a(JIT.o): In function `JSC::JITSlowPathCall::call() [clone .constprop.138]':
JIT.cpp:(.text+0x30ac): undefined reference to `ctiVMHandleException'
/local/wkit/slavebuildbot_LOCAL/workspace_LOCAL/qt-linux-sh4-release/build/WebKitBuild/Release/Source/JavaScriptCore/release/libJavaScriptCore.a(JITOpcodes32_64.o): In function `JSC::JIT::privateCompileCTINativeCall(JSC::VM*, long long (*)(JSC::ExecState*))':
JITOpcodes32_64.cpp:(.text+0x2194): undefined reference to `ctiVMHandleException'
/local/wkit/slavebuildbot_LOCAL/workspace_LOCAL/qt-linux-sh4-release/build/WebKitBuild/Release/Source/JavaScriptCore/release/libJavaScriptCore.a(JITOpcodes32_64.o): In function `JSC::JITSlowPathCall::call() [clone .constprop.99]':
JITOpcodes32_64.cpp:(.text+0x6aac): undefined reference to `ctiVMHandleException'
/local/wkit/slavebuildbot_LOCAL/workspace_LOCAL/qt-linux-sh4-release/build/WebKitBuild/Release/Source/JavaScriptCore/release/libJavaScriptCore.a(ThunkGenerators.o): In function `JSC::nativeForGenerator(JSC::VM*, JSC::CodeSpecializationKind)':
ThunkGenerators.cpp:(.text+0x139c): undefined reference to `ctiVMHandleException'
collect2: ld returned 1 exit status

[Julien Brianceau]

Created attachment 208886 [details]
sh4 build fix

[Mark Lam]

Comment on attachment 208886 [details]
sh4 build fix

View in context: https://bugs.webkit.org/attachment.cgi?id=208886&action=review

> Source/JavaScriptCore/jit/JITStubsSH4.h:120
> -    "lds r1, pr" "\n"
> -    "rts" "\n"
> +    "jmp @r1" "\n"

This part isn't due to r154156.  Why is this necessary?

[Julien Brianceau]

(In reply to comment #2)
> (From update of attachment 208886 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=208886&action=review
> 
> > Source/JavaScriptCore/jit/JITStubsSH4.h:120
> > -    "lds r1, pr" "\n"
> > -    "rts" "\n"
> > +    "jmp @r1" "\n"
> 
> This part isn't due to r154156.  Why is this necessary?

It saves one useless opcode, but you're right, this is not linked to r154156.

Do you want me to provide 2 separate patches ?

[Julien Brianceau]

Created attachment 208891 [details]
sh4 build fix

Build fix only

[Julien Brianceau]

Created attachment 208893 [details]
sh4 build fix (with description in ChangeLog)

[WebKit Commit Bot]

Comment on attachment 208893 [details]
sh4 build fix (with description in ChangeLog)

Clearing flags on attachment: 208893

Committed r154170: <http://trac.webkit.org/changeset/154170>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.