Title: [134025] trunk/Source/_javascript_Core
Revision
134025
Author
o...@webkit.org
Date
2012-11-09 00:40:10 -0800 (Fri, 09 Nov 2012)

Log Message

[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:
* _javascript_Core.pro:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (134024 => 134025)


--- trunk/Source/_javascript_Core/ChangeLog	2012-11-09 08:36:30 UTC (rev 134024)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-11-09 08:40:10 UTC (rev 134025)
@@ -1,3 +1,15 @@
+2012-11-09  Csaba Osztrogonác  <o...@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:
+        * _javascript_Core.pro:
+
 2012-11-08  Filip Pizlo  <fpi...@apple.com>
 
         ArrayPrototype.h should have correct indentation

Modified: trunk/Source/_javascript_Core/DerivedSources.pri (134024 => 134025)


--- trunk/Source/_javascript_Core/DerivedSources.pri	2012-11-09 08:36:30 UTC (rev 134024)
+++ trunk/Source/_javascript_Core/DerivedSources.pri	2012-11-09 08:40:10 UTC (rev 134025)
@@ -102,7 +102,7 @@
     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

Modified: trunk/Source/_javascript_Core/_javascript_Core.pro (134024 => 134025)


--- trunk/Source/_javascript_Core/_javascript_Core.pro	2012-11-09 08:36:30 UTC (rev 134024)
+++ trunk/Source/_javascript_Core/_javascript_Core.pro	2012-11-09 08:40:10 UTC (rev 134025)
@@ -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 @@
 
 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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to