Bug 27602 - Build fix for x86 platforms
Summary: Build fix for x86 platforms
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: JavaScriptCore (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC All
: P2 Normal
Assignee: Adam Barth
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-07-23 02:49 PDT by Csaba Osztrogonác
Modified: 2009-07-24 02:50 PDT (History)
3 users (show)

See Also:


Attachments
proposed patch (1.42 KB, patch)
2009-07-23 02:51 PDT, Csaba Osztrogonác
abarth: review-
Details | Formatted Diff | Diff
proposed patch (1.47 KB, patch)
2009-07-24 02:10 PDT, Csaba Osztrogonác
abarth: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Csaba Osztrogonác 2009-07-23 02:49:12 PDT
If JIT enabled, the original code works. But if JIT disabled and YARR_JIT enabled only,
MacroAssembler.h not included in JIT.h because ENABLE(JIT) macro is false, and it causes build fail.
Comment 1 Csaba Osztrogonác 2009-07-23 02:51:45 PDT
Created attachment 33321 [details]
proposed patch
Comment 2 Adam Barth 2009-07-24 00:59:22 PDT
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	JavaScriptCore/ChangeLog
	M	JavaScriptCore/jit/JIT.cpp
Committed r46334
	M	JavaScriptCore/jit/JIT.cpp
	M	JavaScriptCore/ChangeLog
r46334 = 6a8ef1983c1dbfaebc636ba70a046d28b12b4aab (trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk
http://trac.webkit.org/changeset/46334
Comment 3 Adam Barth 2009-07-24 01:06:04 PDT
Comment on attachment 33321 [details]
proposed patch

This breaks the build.
Comment 4 Adam Barth 2009-07-24 01:08:33 PDT
bugzilla requires a comment here.
Comment 5 Csaba Osztrogonác 2009-07-24 02:02:49 PDT
(In reply to comment #3)
> This breaks the build.

Sorry, it was my fault, because I forgot to delete the last #endif. And during fix it, I found another fix to solve this problem in trunk: http://trac.webkit.org/changeset/46277

I think this fix is not the best solution. You shouldn't include "MacroAssemblerX86Common.h" platform dependent file on all platforms.
Comment 6 Csaba Osztrogonác 2009-07-24 02:10:23 PDT
Created attachment 33414 [details]
proposed patch
Comment 7 Adam Barth 2009-07-24 02:21:25 PDT
Comment on attachment 33414 [details]
proposed patch

This looks like a reasonable modification to the first patch.  Thanks.
Comment 8 Adam Barth 2009-07-24 02:24:11 PDT
I'll try to land this again.
Comment 9 Adam Barth 2009-07-24 02:50:44 PDT
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	JavaScriptCore/ChangeLog
	M	JavaScriptCore/jit/JIT.cpp
Committed r46347
	M	JavaScriptCore/jit/JIT.cpp
	M	JavaScriptCore/ChangeLog
r46347 = 61403abcd62556810c09bae95594d7bf1cb41deb (trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk
http://trac.webkit.org/changeset/46347