From 2d8ea711c33937a40fff2d7dd5f3c8c3a5841f9a Mon Sep 17 00:00:00 2001 From: "fpizlo@apple.com" Date: Thu, 18 Feb 2016 16:48:16 +0000 Subject: [PATCH] Unreviewed, fix CMake build. This got messed up when rebasing. * CMakeLists.txt: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196758 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/JavaScriptCore/CMakeLists.txt | 2 +- Source/JavaScriptCore/ChangeLog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt index aeb7e21..0254487 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -413,7 +413,7 @@ set(JavaScriptCore_SOURCES ftl/FTLLazySlowPath.cpp ftl/FTLLink.cpp ftl/FTLLocation.cpp - ftl/FTLLowerDFGToLLVM.cpp + ftl/FTLLowerDFGToB3.cpp ftl/FTLOSREntry.cpp ftl/FTLOSRExit.cpp ftl/FTLOSRExitCompiler.cpp diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index d87d324..8654f88 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,9 @@ +2016-02-18 Filip Pizlo + + Unreviewed, fix CMake build. This got messed up when rebasing. + + * CMakeLists.txt: + 2016-02-18 Csaba Osztrogonác Fix the !ENABLE(DFG_JIT) build after r195865 -- 1.8.3.1