Changeset 196752 in webkit

Timestamp:

Feb 18, 2016 2:34:47 AM (8 years ago)

Author:

Csaba Osztrogonác

Message:

[cmake] Build system cleanup
​https://bugs.webkit.org/show_bug.cgi?id=154337

Reviewed by Žan Doberšek.

• CMakeLists.txt:

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (6 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -359 +359 @@
     dfg/DFGThunks.cpp
     dfg/DFGTierUpCheckInjectionPhase.cpp
+    dfg/DFGToFTLDeferredCompilationCallback.cpp
+    dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
     dfg/DFGTransition.cpp
     dfg/DFGTypeCheckHoistingPhase.cpp
@@ -392 +394 @@
     disassembler/udis86/udis86_syn-intel.c
     disassembler/udis86/udis86_syn.c
+
+    ftl/FTLAbstractHeap.cpp
+    ftl/FTLAbstractHeapRepository.cpp
+    ftl/FTLAvailableRecovery.cpp
+    ftl/FTLCapabilities.cpp
+    ftl/FTLCommonValues.cpp
+    ftl/FTLCompile.cpp
+    ftl/FTLExceptionTarget.cpp
+    ftl/FTLExitArgument.cpp
+    ftl/FTLExitArgumentForOperand.cpp
+    ftl/FTLExitPropertyValue.cpp
+    ftl/FTLExitTimeObjectMaterialization.cpp
+    ftl/FTLExitValue.cpp
+    ftl/FTLFail.cpp
+    ftl/FTLForOSREntryJITCode.cpp
+    ftl/FTLJITCode.cpp
+    ftl/FTLJITFinalizer.cpp
+    ftl/FTLLazySlowPath.cpp
+    ftl/FTLLink.cpp
+    ftl/FTLLocation.cpp
+    ftl/FTLLowerDFGToLLVM.cpp
+    ftl/FTLOSREntry.cpp
+    ftl/FTLOSRExit.cpp
+    ftl/FTLOSRExitCompiler.cpp
+    ftl/FTLOSRExitHandle.cpp
+    ftl/FTLOperations.cpp
+    ftl/FTLOutput.cpp
+    ftl/FTLPatchpointExceptionHandle.cpp
+    ftl/FTLRecoveryOpcode.cpp
+    ftl/FTLSaveRestore.cpp
+    ftl/FTLSlowPathCall.cpp
+    ftl/FTLSlowPathCallKey.cpp
+    ftl/FTLState.cpp
+    ftl/FTLThunks.cpp
+    ftl/FTLValueRange.cpp
 
     heap/CodeBlockSet.cpp
@@ -524 +561 @@
     jit/ThunkGenerators.cpp
 
+    llint/LLIntCLoop.cpp
+    llint/LLIntData.cpp
+    llint/LLIntEntrypoint.cpp
+    llint/LLIntExceptions.cpp
+    llint/LLIntSlowPaths.cpp
+    llint/LLIntThunks.cpp
+    llint/LowLevelInterpreter.cpp
+
     parser/Lexer.cpp
     parser/ModuleAnalyzer.cpp
@@ -553 +598 @@
     profiler/ProfilerProfiledBytecodes.cpp
 
-    tools/CodeProfile.cpp
-    tools/CodeProfiling.cpp
-    tools/FunctionOverrides.cpp
-    tools/JSDollarVM.cpp
-    tools/JSDollarVMPrototype.cpp
-
-    wasm/JSWASMModule.cpp
-    wasm/WASMFunctionParser.cpp
-    wasm/WASMModuleParser.cpp
-    wasm/WASMReader.cpp
-
-    yarr/RegularExpression.cpp
-    yarr/YarrCanonicalizeUCS2.cpp
-    yarr/YarrInterpreter.cpp
-    yarr/YarrJIT.cpp
-    yarr/YarrPattern.cpp
-    yarr/YarrSyntaxChecker.cpp
-)
-
-set(JavaScriptCore_RUNTIME_SOURCES
     runtime/ArgList.cpp
     runtime/ArrayBuffer.cpp
@@ -790 +815 @@
     runtime/WeakSetConstructor.cpp
     runtime/WeakSetPrototype.cpp
-)
-
-list(APPEND JavaScriptCore_SOURCES
-    ${JavaScriptCore_RUNTIME_SOURCES}
+
+    tools/CodeProfile.cpp
+    tools/CodeProfiling.cpp
+    tools/FunctionOverrides.cpp
+    tools/JSDollarVM.cpp
+    tools/JSDollarVMPrototype.cpp
+
+    wasm/JSWASMModule.cpp
+    wasm/WASMFunctionParser.cpp
+    wasm/WASMModuleParser.cpp
+    wasm/WASMReader.cpp
+
+    yarr/RegularExpression.cpp
+    yarr/YarrCanonicalizeUCS2.cpp
+    yarr/YarrInterpreter.cpp
+    yarr/YarrJIT.cpp
+    yarr/YarrPattern.cpp
+    yarr/YarrSyntaxChecker.cpp
 )
 
@@ -983 +1022 @@
 endif ()
 
-list(APPEND JavaScriptCore_SOURCES
-    llint/LLIntCLoop.cpp
-    llint/LLIntData.cpp
-    llint/LLIntEntrypoint.cpp
-    llint/LLIntExceptions.cpp
-    llint/LLIntSlowPaths.cpp
-    llint/LLIntThunks.cpp
-    llint/LowLevelInterpreter.cpp
-)
-
-if (ENABLE_FTL_JIT)
-    list(APPEND JavaScriptCore_SOURCES
-        dfg/DFGToFTLDeferredCompilationCallback.cpp
-        dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
-
-        ftl/FTLAbstractHeap.cpp
-        ftl/FTLAbstractHeapRepository.cpp
-        ftl/FTLAvailableRecovery.cpp
-        ftl/FTLCapabilities.cpp
-        ftl/FTLCommonValues.cpp
-        ftl/FTLCompile.cpp
-        ftl/FTLExceptionTarget.cpp
-        ftl/FTLExitArgument.cpp
-        ftl/FTLExitArgumentForOperand.cpp
-        ftl/FTLExitPropertyValue.cpp
-        ftl/FTLExitTimeObjectMaterialization.cpp
-        ftl/FTLExitValue.cpp
-        ftl/FTLFail.cpp
-        ftl/FTLForOSREntryJITCode.cpp
-        ftl/FTLJITCode.cpp
-        ftl/FTLJITFinalizer.cpp
-        ftl/FTLLazySlowPath.cpp
-        ftl/FTLLink.cpp
-        ftl/FTLLocation.cpp
-        ftl/FTLLowerDFGToLLVM.cpp
-        ftl/FTLOSREntry.cpp
-        ftl/FTLOSRExit.cpp
-        ftl/FTLOSRExitCompiler.cpp
-        ftl/FTLOSRExitHandle.cpp
-        ftl/FTLOperations.cpp
-        ftl/FTLOutput.cpp
-        ftl/FTLPatchpointExceptionHandle.cpp
-        ftl/FTLRecoveryOpcode.cpp
-        ftl/FTLSaveRestore.cpp
-        ftl/FTLSlowPathCall.cpp
-        ftl/FTLSlowPathCallKey.cpp
-        ftl/FTLState.cpp
-        ftl/FTLThunks.cpp
-        ftl/FTLValueRange.cpp
-    )
-endif ()
-
 set(HASH_LUT_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/create_hash_table)
 macro(GENERATE_HASH_LUT _input _output)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-18  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Build system cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=154337
+
+        Reviewed by Žan Doberšek.
+
+        * CMakeLists.txt:
+
 2016-02-17  Mark Lam  <mark.lam@apple.com>