Title: [184168] releases/WebKitGTK/webkit-2.8
- Revision
- 184168
- Author
- [email protected]
- Date
- 2015-05-12 01:03:07 -0700 (Tue, 12 May 2015)
Log Message
Merge r183741 - [cmake] Disable GNU Gold linker on Cortex A53
https://bugs.webkit.org/show_bug.cgi?id=144382
Reviewed by Carlos Garcia Campos.
* Source/cmake/OptionsCommon.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (184167 => 184168)
--- releases/WebKitGTK/webkit-2.8/ChangeLog 2015-05-12 08:00:57 UTC (rev 184167)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog 2015-05-12 08:03:07 UTC (rev 184168)
@@ -1,3 +1,12 @@
+2015-05-04 Csaba Osztrogonác <[email protected]>
+
+ [cmake] Disable GNU Gold linker on Cortex A53
+ https://bugs.webkit.org/show_bug.cgi?id=144382
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsCommon.cmake:
+
2015-04-14 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.8.1 release.
Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsCommon.cmake (184167 => 184168)
--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsCommon.cmake 2015-05-12 08:00:57 UTC (rev 184167)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsCommon.cmake 2015-05-12 08:03:07 UTC (rev 184168)
@@ -56,12 +56,14 @@
if (CXX_ACCEPTS_MFIX_CORTEX_A53_835769)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfix-cortex-a53-835769")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfix-cortex-a53-835769")
- message(STATUS "Enabling Cortex-A53 workaround for compiler")
+ message(STATUS "Enabling Cortex-A53 workaround for compiler and disabling GNU gold linker, because it doesn't support this workaround.")
endif ()
endif ()
# Use ld.gold if it is available and isn't disabled explicitly
-option(USE_LD_GOLD "Use GNU gold linker" ON)
+include(CMakeDependentOption)
+CMAKE_DEPENDENT_OPTION(USE_LD_GOLD "Use GNU gold linker" ON
+ "NOT CXX_ACCEPTS_MFIX_CORTEX_A53_835769" OFF)
if (USE_LD_GOLD)
execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
if ("${LD_VERSION}" MATCHES "GNU gold")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
