Title: [168700] releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake
- Revision
- 168700
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:27:00 -0700 (Tue, 13 May 2014)
Log Message
Merge 164090 - [GTK] [CMake] _javascript_Core crashes in JSC::eval
https://bugs.webkit.org/show_bug.cgi?id=128434
Extend a fix for EFL to all ports that use GCC. Also include further fixes
that were applied only to the autotools build.
Reviewed by Gyuyoung Kim.
* Source/cmake/OptionsCommon.cmake: Add -fno-omit-frame-pointer to all ports as well
as -fno-tree-dce, which is necessary for GTK+.
* Source/cmake/OptionsEfl.cmake: The GCC flag additions are now in the common options file.
Conflicts:
ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake (168699 => 168700)
--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake 2014-05-13 19:26:49 UTC (rev 168699)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsCommon.cmake 2014-05-13 19:27:00 UTC (rev 168700)
@@ -19,6 +19,12 @@
set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++")
endif ()
+# Push of rbp is needed after JSC JIT uses CStack. See http://wkbug.com/127777.
+if (CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
+ set(CMAKE_C_FLAGS_RELEASE "-fno-omit-frame-pointer -fno-tree-dce ${CMAKE_C_FLAGS_RELEASE}")
+ set(CMAKE_CXX_FLAGS_RELEASE "-fno-omit-frame-pointer -fno-tree-dce ${CMAKE_CXX_FLAGS_RELEASE}")
+endif ()
+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
