Title: [135770] trunk/Source
- Revision
- 135770
- Author
- zeno.albis...@digia.com
- Date
- 2012-11-26 14:45:20 -0800 (Mon, 26 Nov 2012)
Log Message
[Qt] Fix the LLInt build on Mac
https://bugs.webkit.org/show_bug.cgi?id=97587
Reviewed by Simon Hausmann.
Source/_javascript_Core:
* DerivedSources.pri:
* _javascript_Core.pro:
Source/WTF:
* wtf/InlineASM.h:
Use OS(DARWIN) instead of PLATFORM(MAC),
in order to allow Qt to use the same code.
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (135769 => 135770)
--- trunk/Source/_javascript_Core/ChangeLog 2012-11-26 22:43:40 UTC (rev 135769)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-11-26 22:45:20 UTC (rev 135770)
@@ -1,3 +1,13 @@
+2012-11-26 Zeno Albisser <z...@webkit.org>
+
+ [Qt] Fix the LLInt build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=97587
+
+ Reviewed by Simon Hausmann.
+
+ * DerivedSources.pri:
+ * _javascript_Core.pro:
+
2012-11-26 Oliver Hunt <oli...@apple.com>
32-bit build fix. Move the method decalration outside of the X86_64 only section.
Modified: trunk/Source/_javascript_Core/DerivedSources.pri (135769 => 135770)
--- trunk/Source/_javascript_Core/DerivedSources.pri 2012-11-26 22:43:40 UTC (rev 135769)
+++ trunk/Source/_javascript_Core/DerivedSources.pri 2012-11-26 22:45:20 UTC (rev 135770)
@@ -102,15 +102,13 @@
exists($$file): LLINT_FILES += $$file
}
-if(linux-*|win32) {
- #GENERATOR: LLInt
- llint.output = ${QMAKE_FILE_IN_PATH}$${QMAKE_DIR_SEP}LLIntAssembly.h
- llint.script = $$PWD/offlineasm/asm.rb
- llint.input = LLINT_FILES
- llint.depends = $$LLINT_DEPENDENCY
- llint.commands = ruby $$llint.script $$LLINT_ASSEMBLER ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
- GENERATORS += llint
-}
+#GENERATOR: LLInt
+llint.output = ${QMAKE_FILE_IN_PATH}$${QMAKE_DIR_SEP}LLIntAssembly.h
+llint.script = $$PWD/offlineasm/asm.rb
+llint.input = LLINT_FILES
+llint.depends = $$LLINT_DEPENDENCY
+llint.commands = ruby $$llint.script $$LLINT_ASSEMBLER ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+GENERATORS += llint
linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
# GENERATOR: disassembler
Modified: trunk/Source/_javascript_Core/_javascript_Core.pro (135769 => 135770)
--- trunk/Source/_javascript_Core/_javascript_Core.pro 2012-11-26 22:43:40 UTC (rev 135769)
+++ trunk/Source/_javascript_Core/_javascript_Core.pro 2012-11-26 22:45:20 UTC (rev 135770)
@@ -7,18 +7,16 @@
TEMPLATE = subdirs
CONFIG += ordered
-if(linux-*|win32*) {
- LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro
- LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor
- SUBDIRS += LLIntOffsetsExtractor
-}
+LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro
+LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor
+SUBDIRS += LLIntOffsetsExtractor
derived_sources.file = DerivedSources.pri
target.file = Target.pri
SUBDIRS += derived_sources target
-if(linux-*|win32*):addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources)
+addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources)
addStrictSubdirOrderBetween(derived_sources, target)
jsc.file = jsc.pro
Modified: trunk/Source/WTF/ChangeLog (135769 => 135770)
--- trunk/Source/WTF/ChangeLog 2012-11-26 22:43:40 UTC (rev 135769)
+++ trunk/Source/WTF/ChangeLog 2012-11-26 22:45:20 UTC (rev 135770)
@@ -1,3 +1,15 @@
+2012-11-26 Zeno Albisser <z...@webkit.org>
+
+ [Qt] Fix the LLInt build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=97587
+
+ Reviewed by Simon Hausmann.
+
+ * wtf/InlineASM.h:
+ Use OS(DARWIN) instead of PLATFORM(MAC),
+ in order to allow Qt to use the same code.
+ * wtf/Platform.h:
+
2012-11-26 Patrick Gansterer <par...@webkit.org>
Build fix for WinCE after r135640.
Modified: trunk/Source/WTF/wtf/InlineASM.h (135769 => 135770)
--- trunk/Source/WTF/wtf/InlineASM.h 2012-11-26 22:43:40 UTC (rev 135769)
+++ trunk/Source/WTF/wtf/InlineASM.h 2012-11-26 22:45:20 UTC (rev 135770)
@@ -77,7 +77,7 @@
// FIXME: figure out how this works on all the platforms. I know that
// on ELF, the preferred form is ".Lstuff" as opposed to "Lstuff".
// Don't know about any of the others.
-#if PLATFORM(MAC)
+#if OS(DARWIN)
#define LOCAL_LABEL_STRING(name) "L" #name
#elif OS(LINUX) \
|| OS(FREEBSD) \
Modified: trunk/Source/WTF/wtf/Platform.h (135769 => 135770)
--- trunk/Source/WTF/wtf/Platform.h 2012-11-26 22:43:40 UTC (rev 135769)
+++ trunk/Source/WTF/wtf/Platform.h 2012-11-26 22:45:20 UTC (rev 135770)
@@ -926,7 +926,7 @@
#if !defined(ENABLE_LLINT) \
&& ENABLE(JIT) \
&& (OS(DARWIN) || OS(LINUX)) \
- && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK) || (PLATFORM(QT) && OS(LINUX))) \
+ && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(QT)) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2))
#define ENABLE_LLINT 1
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
