diff options
| author | Csaba Osztrogonác <ossy@webkit.org> | 2012-11-09 08:40:10 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:21:51 +0100 |
| commit | 9b4188281687e49303547ec84e616b03a03e4507 (patch) | |
| tree | 46603fe22967cbf532a8516a8d89b9ef7ed60e33 /Source/JavaScriptCore | |
| parent | de4f791e30be4e4239b381c11745ffa4d87ddb8b (diff) | |
| download | qtwebkit-9b4188281687e49303547ec84e616b03a03e4507.tar.gz | |
[Qt] Fix the LLINT build from ARMv7 platform
https://bugs.webkit.org/show_bug.cgi?id=101712
Reviewed by Simon Hausmann.
Enable generating of LLIntAssembly.h on ARM platforms.
* DerivedSources.pri:
* JavaScriptCore.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@134025 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/ChangeLog | 12 | ||||
| -rw-r--r-- | Source/JavaScriptCore/DerivedSources.pri | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pro | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 320b1cfbe..3c0e4ddae 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2012-11-09 Csaba Osztrogonác <ossy@webkit.org> + + [Qt] Fix the LLINT build from ARMv7 platform + https://bugs.webkit.org/show_bug.cgi?id=101712 + + Reviewed by Simon Hausmann. + + Enable generating of LLIntAssembly.h on ARM platforms. + + * DerivedSources.pri: + * JavaScriptCore.pro: + 2012-11-08 Balazs Kilvady <kilvadyb@homejinni.com> ASSERT problem on MIPS diff --git a/Source/JavaScriptCore/DerivedSources.pri b/Source/JavaScriptCore/DerivedSources.pri index 03a935575..f9bbbf67c 100644 --- a/Source/JavaScriptCore/DerivedSources.pri +++ b/Source/JavaScriptCore/DerivedSources.pri @@ -102,7 +102,7 @@ for(dir, DIRS) { exists($$file): LLINT_FILES += $$file } -if(linux-*|win32):!equals(QT_ARCH, "arm") { +if(linux-*|win32) { #GENERATOR: LLInt llint.output = ${QMAKE_FILE_IN_PATH}$${QMAKE_DIR_SEP}LLIntAssembly.h llint.script = $$PWD/offlineasm/asm.rb diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro index c86ca8e3d..924261d4f 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pro +++ b/Source/JavaScriptCore/JavaScriptCore.pro @@ -7,7 +7,7 @@ TEMPLATE = subdirs CONFIG += ordered -if(linux-*|win32*):!equals(QT_ARCH, "arm") { +if(linux-*|win32*) { LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor SUBDIRS += LLIntOffsetsExtractor @@ -18,7 +18,7 @@ target.file = Target.pri SUBDIRS += derived_sources target -if(linux-*|win32*):!equals(QT_ARCH, "arm"):addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources) +if(linux-*|win32*):addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources) addStrictSubdirOrderBetween(derived_sources, target) jsc.file = jsc.pro |