Skip to content

Commit 3e052ce

Browse files
author
[email protected]
committed
Merge r238619 - [CMake] Automatically disable JIT and enable USE_SYSTEM_MALLOC on unfamiliar architectures
https://bugs.webkit.org/show_bug.cgi?id=186722 Reviewed by Žan Doberšek. Time for part #2! This change was defeated for GTK and WPE by the code that makes the options public. We have three options: (a) duplicate the architecture check currently in WebKitFeatures.cmake in both OptionsGTK.cmake and OptionsWPE.cmake, (b) rely on the result of that check in OptionsGTK.cmake and OptionsWPE.cmake by using ENABLE_JIT_DEFAULT and USE_SYSTEM_MALLOC_DEFAULT, a fragile encapsulation violation, or (c) just make the options private. They have been public up until now because they needed to be turned off on unsupported architectures. But now they are off by default and enabled only for particular whitelisted architectures, so they shouldn't be needed anymore. Note we have to hide ENABLE_SAMPLING_PROFILER as well, since it needs to match the value of ENABLE_JIT. Again, this is handled properly in WebKitFeatures.cmake, and defeated here in OptionsGTK.cmake. (This is not a problem for WPE.) * Source/cmake/OptionsGTK.cmake: * Source/cmake/OptionsWPE.cmake: git-svn-id: http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.22@239001 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5b1eb40 commit 3e052ce

3 files changed

Lines changed: 23 additions & 5 deletions

File tree

‎ChangeLog‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
2018-11-28 Michael Catanzaro <[email protected]>
2+
3+
[CMake] Automatically disable JIT and enable USE_SYSTEM_MALLOC on unfamiliar architectures
4+
https://bugs.webkit.org/show_bug.cgi?id=186722
5+
6+
Reviewed by Žan Doberšek.
7+
8+
Time for part #2! This change was defeated for GTK and WPE by the code that makes the
9+
options public. We have three options: (a) duplicate the architecture check currently in
10+
WebKitFeatures.cmake in both OptionsGTK.cmake and OptionsWPE.cmake, (b) rely on the result
11+
of that check in OptionsGTK.cmake and OptionsWPE.cmake by using ENABLE_JIT_DEFAULT and
12+
USE_SYSTEM_MALLOC_DEFAULT, a fragile encapsulation violation, or (c) just make the options
13+
private. They have been public up until now because they needed to be turned off on
14+
unsupported architectures. But now they are off by default and enabled only for particular
15+
whitelisted architectures, so they shouldn't be needed anymore.
16+
17+
Note we have to hide ENABLE_SAMPLING_PROFILER as well, since it needs to match the value of
18+
ENABLE_JIT. Again, this is handled properly in WebKitFeatures.cmake, and defeated here in
19+
OptionsGTK.cmake. (This is not a problem for WPE.)
20+
21+
* Source/cmake/OptionsGTK.cmake:
22+
* Source/cmake/OptionsWPE.cmake:
23+
124
2018-12-06 Carlos Eduardo Ramalho <[email protected]>
225

326
[GStreamer] -DENABLE_VIDEO=ON -DENABLE_OPENGL=OFF still tries to build GstreamerGL

‎Source/cmake/OptionsGTK.cmake‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
127127
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
128128
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
129129
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PUBLIC ON)
130-
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC ON)
131-
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PUBLIC ON)
132130
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
133131
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
134132
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
135133
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
136-
WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
137134

138135
# Private options shared with other WebKit ports. Add options here when
139136
# we need a value different from the default defined in WebKitFeatures.cmake.

‎Source/cmake/OptionsWPE.cmake‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ include(GStreamerDefinitions)
2121
# changing the value of the option.
2222
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
2323
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
24-
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC ON)
2524
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
2625
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
2726
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
28-
WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
2927

3028
# Private options shared with other WebKit ports. Add options here only if
3129
# we need a value different from the default defined in WebKitFeatures.cmake.

0 commit comments

Comments
 (0)