diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
| commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
| tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/JavaScriptCore/Target.pri | |
| parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
| download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz | |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/JavaScriptCore/Target.pri')
| -rw-r--r-- | Source/JavaScriptCore/Target.pri | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri index 2f479222a..b019e417e 100644 --- a/Source/JavaScriptCore/Target.pri +++ b/Source/JavaScriptCore/Target.pri @@ -83,6 +83,7 @@ SOURCES += \ heap/Heap.cpp \ heap/HeapTimer.cpp \ heap/IncrementalSweeper.cpp \ + heap/JITStubRoutineSet.cpp \ heap/MachineStackMarker.cpp \ heap/MarkStack.cpp \ heap/MarkedAllocator.cpp \ @@ -109,6 +110,7 @@ SOURCES += \ dfg/DFGFixupPhase.cpp \ dfg/DFGGraph.cpp \ dfg/DFGJITCompiler.cpp \ + dfg/DFGMinifiedNode.cpp \ dfg/DFGNodeFlags.cpp \ dfg/DFGOperations.cpp \ dfg/DFGOSREntry.cpp \ @@ -124,6 +126,9 @@ SOURCES += \ dfg/DFGSpeculativeJIT32_64.cpp \ dfg/DFGSpeculativeJIT64.cpp \ dfg/DFGThunks.cpp \ + dfg/DFGValueSource.cpp \ + dfg/DFGVariableEvent.cpp \ + dfg/DFGVariableEventStream.cpp \ dfg/DFGValidate.cpp \ dfg/DFGVirtualRegisterAllocationPhase.cpp \ interpreter/AbstractPC.cpp \ @@ -133,6 +138,7 @@ SOURCES += \ jit/ExecutableAllocatorFixedVMPool.cpp \ jit/ExecutableAllocator.cpp \ jit/HostCallReturnValue.cpp \ + jit/GCAwareJITStubRoutine.cpp \ jit/JITArithmetic.cpp \ jit/JITArithmetic32_64.cpp \ jit/JITCall.cpp \ @@ -143,6 +149,7 @@ SOURCES += \ jit/JITOpcodes32_64.cpp \ jit/JITPropertyAccess.cpp \ jit/JITPropertyAccess32_64.cpp \ + jit/JITStubRoutine.cpp \ jit/JITStubs.cpp \ jit/ThunkGenerators.cpp \ parser/Lexer.cpp \ @@ -248,6 +255,8 @@ SOURCES += \ tools/CodeProfiling.cpp \ yarr/YarrJIT.cpp \ +HEADERS += $$files(*.h, true) + *sh4* { QMAKE_CXXFLAGS += -mieee -w QMAKE_CFLAGS += -mieee -w @@ -259,15 +268,4 @@ lessThan(QT_GCC_MAJOR_VERSION, 5) { # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec. *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x } - - # GCC 4.6 and after. - greaterThan(QT_GCC_MINOR_VERSION, 5) { - if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { - # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). - QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat - QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat - QMAKE_CFLAGS += -Wno-c++0x-compat - QMAKE_CXXFLAGS += -Wno-c++0x-compat - } - } } |