60283 2011-05-05 11:40:11 -0700 Fix MIPS build due to AssemblerLabel 2011-05-12 15:31:57 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 fu webkit-unassigned barraclough eric webkit.review.bot oldest_to_newest 398874 0 fu 2011-05-05 11:40:11 -0700 Need to swap the header file to make MIPS build. Will submit a patch soon. Thanks! Index: assembler/MacroAssemblerMIPS.h =================================================================== --- assembler/MacroAssemblerMIPS.h (revision 85839) +++ assembler/MacroAssemblerMIPS.h (working copy) @@ -29,8 +29,8 @@ #if ENABLE(ASSEMBLER) && CPU(MIPS) +#include "MIPSAssembler.h" #include "AbstractMacroAssembler.h" -#include "MIPSAssembler.h" namespace JSC { 398879 1 92438 fu 2011-05-05 11:45:45 -0700 Created attachment 92438 Swap two header files Here is the patch. Thanks! 398880 2 webkit.review.bot 2011-05-05 11:47:32 -0700 Attachment 92438 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h:33: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 402576 3 92438 eric 2011-05-11 20:07:49 -0700 Comment on attachment 92438 Swap two header files Huh? Header order should never matter in WebKit. Should one of these be importing the other? 402953 4 fu 2011-05-12 10:48:21 -0700 1. "MIPSAssembler.h" includes "AssemblerBuffer.h" that defines "struct AssemblerLabel". 2. "AbstractMacroAssembler.h" needs to have the definition of "struct AssemblerLabel". So, I need to include "MIPSAssembler.h" before including "AbstractMacroAssembler.h". Or, can we modify "AbstractMacroAssembler.h" to include "AssemblerBuffer.h directly"? Thanks! Regards, Chao-ying 403206 5 fu 2011-05-12 15:31:57 -0700 r86239 fixed this bug. So, just close this. Thanks! r86239 | zecke@webkit.org | 2011-05-11 09:42:43 -0700 (Wed, 11 May 2011) | 7 lines [MIPS] Fix compilation of the MIPS JIT Include the MIPSAssembler.h first to indirectly include AssemblerBuffer.h before the AbstractMacroAssembler.h. This order is used for the ARM and X86 MacroAssembler*.h. * assembler/MacroAssemblerMIPS.h: 92438 2011-05-05 11:45:45 -0700 2011-05-11 20:07:49 -0700 Swap two header files mips20110505.diff text/plain 1044 fu SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODU4NjYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTEtMDUtMDUgIENoYW8teWluZyBGdSAgPGZ1QG1pcHMuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBNSVBTIGJ1aWxkIGR1ZSB0byBB c3NlbWJsZXJMYWJlbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjAyODMKKyAgICAgICAgU3dhcCB0d28gaGVhZGVyIGZpbGVzLgorCisgICAgICAgICog YXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oOgorCiAyMDExLTA1LTA1ICBBbGV4aXMgTWVu YXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEJlbmphbWluIFBvdWxhaW4uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyTUlQUy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgJKHJldmlzaW9uIDg1ODM5KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjksOCArMjksOCBAQAogCiAjaWYgRU5BQkxFKEFTU0VNQkxFUikgJiYgQ1BV KE1JUFMpCiAKLSNpbmNsdWRlICJBYnN0cmFjdE1hY3JvQXNzZW1ibGVyLmgiCiAjaW5jbHVkZSAi TUlQU0Fzc2VtYmxlci5oIgorI2luY2x1ZGUgIkFic3RyYWN0TWFjcm9Bc3NlbWJsZXIuaCIKIAog bmFtZXNwYWNlIEpTQyB7CiAK