Title: [196113] trunk
- Revision
- 196113
- Author
- [email protected]
- Date
- 2016-02-04 02:05:09 -0800 (Thu, 04 Feb 2016)
Log Message
Unreviewed non X86_64 buildfix after r196077.
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (196112 => 196113)
--- trunk/ChangeLog 2016-02-04 08:25:28 UTC (rev 196112)
+++ trunk/ChangeLog 2016-02-04 10:05:09 UTC (rev 196113)
@@ -1,3 +1,10 @@
+2016-02-04 Csaba Osztrogonác <[email protected]>
+
+ Unreviewed non X86_64 buildfix after r196077.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
2016-02-03 Michael Catanzaro <[email protected]>
[GTK][EFL] Switch FTL to B3
Modified: trunk/Source/cmake/OptionsEfl.cmake (196112 => 196113)
--- trunk/Source/cmake/OptionsEfl.cmake 2016-02-04 08:25:28 UTC (rev 196112)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-02-04 10:05:09 UTC (rev 196113)
@@ -69,6 +69,12 @@
set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
endif ()
+if (WTF_CPU_X86_64)
+ set(ENABLE_FTL_DEFAULT ON)
+else ()
+ set(ENABLE_FTL_DEFAULT OFF)
+endif ()
+
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALLINONE_BUILD PUBLIC OFF)
@@ -91,7 +97,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${WTF_CPU_X86_64})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${ENABLE_FTL_DEFAULT})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
Modified: trunk/Source/cmake/OptionsGTK.cmake (196112 => 196113)
--- trunk/Source/cmake/OptionsGTK.cmake 2016-02-04 08:25:28 UTC (rev 196112)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-02-04 10:05:09 UTC (rev 196113)
@@ -66,6 +66,12 @@
set(ENABLE_GLES2_DEFAULT ON)
endif ()
+if (WTF_CPU_X86_64)
+ set(ENABLE_FTL_DEFAULT ON)
+else ()
+ set(ENABLE_FTL_DEFAULT OFF)
+endif ()
+
# Public options specific to the GTK+ port. Do not add any options here unless
# there is a strong reason we should support changing the value of the option,
# and the option is not relevant to any other WebKit ports.
@@ -146,7 +152,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ${WTF_CPU_X86_64})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ${ENABLE_FTL_DEFAULT})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
