Diff
Modified: trunk/ChangeLog (169180 => 169181)
--- trunk/ChangeLog 2014-05-22 00:11:07 UTC (rev 169180)
+++ trunk/ChangeLog 2014-05-22 00:12:47 UTC (rev 169181)
@@ -1,3 +1,13 @@
+2014-05-21 Zsolt Borbely <[email protected]>
+
+ [EFL] Add include path of compact_unwind_encoding.h if FTL JIT is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=132907
+
+ Reviewed by Gyuyoung Kim.
+
+ * Source/cmake/FindLIBCXXABI.cmake: Added.
+ * Source/cmake/OptionsEfl.cmake:
+
2014-05-21 Michał Pakuła vel Rutka <[email protected]>
[EFL] Turn on ENABLE_CSS_FILTERS
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (169180 => 169181)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2014-05-22 00:11:07 UTC (rev 169180)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2014-05-22 00:12:47 UTC (rev 169181)
@@ -688,6 +688,7 @@
# Added extra items for _javascript_Core
list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
${LLVM_INCLUDE_DIRS}
+ ${LIBCXXABI_INCLUDE_DIRS}
)
list(APPEND _javascript_Core_SOURCES
Modified: trunk/Source/_javascript_Core/ChangeLog (169180 => 169181)
--- trunk/Source/_javascript_Core/ChangeLog 2014-05-22 00:11:07 UTC (rev 169180)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-05-22 00:12:47 UTC (rev 169181)
@@ -1,3 +1,12 @@
+2014-05-21 Zsolt Borbely <[email protected]>
+
+ [EFL] Add include path of compact_unwind_encoding.h if FTL JIT is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=132907
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt:
+
2014-05-16 Martin Robinson <[email protected]>
[CMake] Improve handling of LIB_INSTALL_DIR, EXEC_INSTALL_DIR, and LIBEXEC_INSTALL_DIR
Added: trunk/Source/cmake/FindLIBCXXABI.cmake (0 => 169181)
--- trunk/Source/cmake/FindLIBCXXABI.cmake (rev 0)
+++ trunk/Source/cmake/FindLIBCXXABI.cmake 2014-05-22 00:12:47 UTC (rev 169181)
@@ -0,0 +1,40 @@
+# - Try to find libcxxabi
+# This module defines the following variable:
+#
+# LIBCXXABI_FOUND - true if libcxxabi found
+# LIBCXXABI_INCLUDE_DIRS - the libcxxabi include directories
+#
+# Copyright (C) 2014 Samsung Electronics
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_path(LIBCXXABI_INCLUDE_DIRS
+ NAMES mach-o/compact_unwind_encoding.h
+ PATH_SUFFIXES libcxxabi
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Libcxxabi DEFAULT_MSG LIBCXXABI_INCLUDE_DIRS)
+
+mark_as_advanced(
+ LIBCXXABI_INCLUDE_DIRS
+)
Modified: trunk/Source/cmake/OptionsEfl.cmake (169180 => 169181)
--- trunk/Source/cmake/OptionsEfl.cmake 2014-05-22 00:11:07 UTC (rev 169180)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-05-22 00:12:47 UTC (rev 169181)
@@ -292,6 +292,7 @@
if (ENABLE_FTL_JIT)
find_package(LLVM REQUIRED)
+ find_package(LIBCXXABI REQUIRED)
set(HAVE_LLVM ON)
endif ()
Modified: trunk/Tools/ChangeLog (169180 => 169181)
--- trunk/Tools/ChangeLog 2014-05-22 00:11:07 UTC (rev 169180)
+++ trunk/Tools/ChangeLog 2014-05-22 00:12:47 UTC (rev 169181)
@@ -1,3 +1,15 @@
+2014-05-21 Zsolt Borbely <[email protected]>
+
+ [EFL] Add include path of compact_unwind_encoding.h if FTL JIT is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=132907
+
+ Reviewed by Gyuyoung Kim.
+
+ We need the mach-o/compact_unwind_encoding.h header from libc++abi-dev package
+ in _javascript_Core/ftl/FTLUnwindInfo.cpp when FTL JIT is enabled.
+
+ * efl/install-dependencies:
+
2014-05-21 Eva Balazsfalvi <[email protected]>
REGRESSION(r169092): It broke run-jsc-stress tests on non Mac platforms
Modified: trunk/Tools/efl/install-dependencies (169180 => 169181)
--- trunk/Tools/efl/install-dependencies 2014-05-22 00:11:07 UTC (rev 169180)
+++ trunk/Tools/efl/install-dependencies 2014-05-22 00:12:47 UTC (rev 169181)
@@ -62,6 +62,7 @@
libxrender-dev \
libp11-kit-dev \
libgpg-error-dev \
+ libc++abi-dev \
libgcrypt11-dev
# These are dependencies necessary for running tests.
