diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/3rdparty/double-conversion/double-conversion.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 24 | ||||
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 24 | ||||
| -rw-r--r-- | src/v4/v4.pri | 6 | ||||
| -rw-r--r-- | src/v4/v4.pro | 6 | ||||
| -rw-r--r-- | tools/v4/v4.pro | 17 |
7 files changed, 34 insertions, 46 deletions
@@ -7,3 +7,4 @@ udis86_itab.* *.bc *.ll RegExpJitTables.h +.qmake.cache diff --git a/src/3rdparty/double-conversion/double-conversion.pri b/src/3rdparty/double-conversion/double-conversion.pri index 8bb37c63..4ad5f9f7 100644 --- a/src/3rdparty/double-conversion/double-conversion.pri +++ b/src/3rdparty/double-conversion/double-conversion.pri @@ -1,4 +1,4 @@ -INCLUDEPATH += $PWD +INCLUDEPATH += $$PWD VPATH += $$PWD SOURCES += $$PWD/*.cc HEADERS += $$PWD/*.h diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri new file mode 100644 index 00000000..34b86e30 --- /dev/null +++ b/src/3rdparty/masm/masm-defs.pri @@ -0,0 +1,24 @@ + +DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" + +DEFINES += ENABLE_LLINT=0 +DEFINES += ENABLE_DFG_JIT=0 +DEFINES += ENABLE_JIT=1 +DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 +DEFINES += ENABLE_ASSEMBLER=1 +DEFINES += ENABLE_YARR_JIT=0 +DEFINES += BUILDING_QT__ + +INCLUDEPATH += $$PWD/jit +INCLUDEPATH += $$PWD/assembler +INCLUDEPATH += $$PWD/runtime +INCLUDEPATH += $$PWD/wtf +INCLUDEPATH += $$PWD/stubs +INCLUDEPATH += $$PWD/stubs/wtf +INCLUDEPATH += $$PWD + +DEFINES += WTF_USE_UDIS86=1 +INCLUDEPATH += $$PWD/disassembler +INCLUDEPATH += $$PWD/disassembler/udis86 +INCLUDEPATH += $$_OUT_PWD + diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 92ad32d4..f1727620 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -1,4 +1,3 @@ - HEADERS += $$PWD/assembler/*.h SOURCES += $$PWD/assembler/ARMAssembler.cpp SOURCES += $$PWD/assembler/ARMv7Assembler.cpp @@ -31,28 +30,6 @@ HEADERS += $$PWD/wtf/PageReservation.h SOURCES += $$PWD/stubs/WTFStubs.cpp HEADERS += $$PWD/stubs/WTFStubs.h -DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" - -DEFINES += ENABLE_LLINT=0 -DEFINES += ENABLE_DFG_JIT=0 -DEFINES += ENABLE_JIT=1 -DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 -DEFINES += ENABLE_ASSEMBLER=1 - -DEFINES += BUILDING_QT__ - -INCLUDEPATH += $$PWD/jit -INCLUDEPATH += $$PWD/assembler -INCLUDEPATH += $$PWD/runtime -INCLUDEPATH += $$PWD/wtf -INCLUDEPATH += $$PWD/stubs -INCLUDEPATH += $$PWD/stubs/wtf -INCLUDEPATH += $$PWD - -DEFINES += WTF_USE_UDIS86=1 -INCLUDEPATH += $$PWD/disassembler -INCLUDEPATH += $$PWD/disassembler/udis86 -INCLUDEPATH += $$_OUT_PWD SOURCES += $$PWD/disassembler/Disassembler.cpp SOURCES += $$PWD/disassembler/UDis86Disassembler.cpp SOURCES += $$PWD/disassembler/udis86/udis86.c @@ -63,7 +40,6 @@ SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c SOURCES += $$PWD/disassembler/udis86/udis86_syn.c SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c -DEFINES += ENABLE_YARR_JIT=0 SOURCES += \ $$PWD/yarr/YarrCanonicalizeUCS2.cpp \ $$PWD/yarr/YarrInterpreter.cpp \ diff --git a/src/v4/v4.pri b/src/v4/v4.pri new file mode 100644 index 00000000..6f70a8c6 --- /dev/null +++ b/src/v4/v4.pri @@ -0,0 +1,6 @@ + +include(../3rdparty/masm/masm-defs.pri) + +!llvm: DEFINES += QMLJS_NO_LLVM + +INCLUDEPATH += $$PWD diff --git a/src/v4/v4.pro b/src/v4/v4.pro index fb7ea805..24832ecd 100644 --- a/src/v4/v4.pro +++ b/src/v4/v4.pro @@ -124,11 +124,6 @@ GEN_LLVM_RUNTIME_FLAGS -= -pedantic gen_llvm_runtime.target = llvm_runtime gen_llvm_runtime.commands = clang -O2 -emit-llvm -c $(INCPATH) $$GEN_LLVM_RUNTIME_FLAGS -DQMLJS_LLVM_RUNTIME llvm_runtime.cpp -o $$LLVM_RUNTIME_BC - -} else { - -DEFINES += QMLJS_NO_LLVM - } # Use SSE2 floating point math on 32 bit instead of the default @@ -155,3 +150,4 @@ QMAKE_EXTRA_TARGETS += checkmothtarget include(moth/moth.pri) include(../3rdparty/masm/masm.pri) include(../3rdparty/double-conversion/double-conversion.pri) +include(v4.pri) diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro index 0b23270f..3f878fa6 100644 --- a/tools/v4/v4.pro +++ b/tools/v4/v4.pro @@ -2,21 +2,6 @@ TEMPLATE = app QT = v4-private core-private qmldevtools-private SOURCES = main.cpp -INCLUDEPATH += ../../src/v4 -INCLUDEPATH += ../../src/3rdparty/masm -INCLUDEPATH += ../../src/3rdparty/masm/wtf -INCLUDEPATH += ../../src/3rdparty/masm/stubs -INCLUDEPATH += ../../src/3rdparty/masm/stubs/wtf -INCLUDEPATH += ../../src/3rdparty/masm/jit -INCLUDEPATH += ../../src/3rdparty/masm/assembler -INCLUDEPATH += ../../src/3rdparty/masm/disassembler +include(../../src/v4/v4.pri) -DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" -DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 ENABLE_LLINT=0 - -llvm { - # TODO LLVM support doesn't work correctly -} else { - DEFINES += QMLJS_NO_LLVM -} load(qt_tool) |