Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (163673 => 163674)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-08 02:11:22 UTC (rev 163674)
@@ -1,3 +1,13 @@
+2014-02-06 Filip Pizlo <fpi...@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * llvm/library/LLVMAnchor.cpp:
+
2014-02-07 Mark Lam <mark....@apple.com>
iOS port needs to clear VM::stackPointerAtVMEntry when it drops locks.
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (163673 => 163674)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-02-08 02:11:22 UTC (rev 163674)
@@ -190,7 +190,12 @@
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
ENABLE_XSLT = ENABLE_XSLT;
-ENABLE_FTL_JIT = ;
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
+ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_FTL_JIT_macosx_1080 = ;
+ENABLE_FTL_JIT_macosx_1090 = ;
+ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+
ENABLE_LLINT_C_LOOP = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Source/_javascript_Core/llvm/library/LLVMAnchor.cpp (163673 => 163674)
--- trunk/Source/_javascript_Core/llvm/library/LLVMAnchor.cpp 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/_javascript_Core/llvm/library/LLVMAnchor.cpp 2014-02-08 02:11:22 UTC (rev 163674)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,13 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config_llvm.h"
-
-#if HAVE(LLVM)
-
// This is a hack for ensuring that the build system relinks _javascript_Core if any
-// of the LLVM libraries are known to have changed.
-#include "WebKitLLVMLibraryToken.h"
-
-#endif // HAVE(LLVM)
-
+// of the LLVM libraries are known to have changed. Ths file will get touched by our
+// perl scripts to trigger a rebuild if a change in LLVM was detected.
Modified: trunk/Source/WTF/ChangeLog (163673 => 163674)
--- trunk/Source/WTF/ChangeLog 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WTF/ChangeLog 2014-02-08 02:11:22 UTC (rev 163674)
@@ -1,3 +1,12 @@
+2014-02-06 Filip Pizlo <fpi...@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * wtf/Platform.h:
+
2014-02-06 Anders Carlsson <ander...@apple.com>
Use std::chrono functions in dispatchFunctionsFromMainThread()
Modified: trunk/Source/WTF/wtf/Platform.h (163673 => 163674)
--- trunk/Source/WTF/wtf/Platform.h 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WTF/wtf/Platform.h 2014-02-08 02:11:22 UTC (rev 163674)
@@ -678,6 +678,12 @@
#define ENABLE_FTL_JIT 1
#endif
+/* The FTL *does not* work on 32-bit platforms. Disable it even if someone asked us to enable it. */
+#if USE(JSVALUE32_64)
+#undef ENABLE_FTL_JIT
+#define ENABLE_FTL_JIT 0
+#endif
+
/* If possible, try to enable the LLVM disassembler. This is optional and we can
fall back on UDis86 if necessary. */
#if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86))
Modified: trunk/Source/WebCore/ChangeLog (163673 => 163674)
--- trunk/Source/WebCore/ChangeLog 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WebCore/ChangeLog 2014-02-08 02:11:22 UTC (rev 163674)
@@ -1,3 +1,14 @@
+2014-02-06 Filip Pizlo <fpi...@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ The FTL already has tests.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-02-07 Alexey Proskuryakov <a...@apple.com>
Remove some unused functions from SerializedScriptValue
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (163673 => 163674)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-02-08 02:11:22 UTC (rev 163674)
@@ -190,7 +190,12 @@
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
ENABLE_XSLT = ENABLE_XSLT;
-ENABLE_FTL_JIT = ;
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
+ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_FTL_JIT_macosx_1080 = ;
+ENABLE_FTL_JIT_macosx_1090 = ;
+ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+
ENABLE_LLINT_C_LOOP = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Source/WebKit/mac/ChangeLog (163673 => 163674)
--- trunk/Source/WebKit/mac/ChangeLog 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-08 02:11:22 UTC (rev 163674)
@@ -1,3 +1,12 @@
+2014-02-06 Filip Pizlo <fpi...@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-02-07 Dan Bernstein <m...@apple.com>
iOS build fix.
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (163673 => 163674)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-02-08 02:11:22 UTC (rev 163674)
@@ -190,7 +190,12 @@
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
ENABLE_XSLT = ENABLE_XSLT;
-ENABLE_FTL_JIT = ;
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
+ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_FTL_JIT_macosx_1080 = ;
+ENABLE_FTL_JIT_macosx_1090 = ;
+ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+
ENABLE_LLINT_C_LOOP = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Source/WebKit2/ChangeLog (163673 => 163674)
--- trunk/Source/WebKit2/ChangeLog 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-08 02:11:22 UTC (rev 163674)
@@ -1,3 +1,12 @@
+2014-02-06 Filip Pizlo <fpi...@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-02-07 Tim Horton <timothy_hor...@apple.com>
Move allowsBackForwardNavigationGestures back to private because apparently our build systems are broken.
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (163673 => 163674)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-02-08 02:11:22 UTC (rev 163674)
@@ -190,7 +190,12 @@
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
ENABLE_XSLT = ENABLE_XSLT;
-ENABLE_FTL_JIT = ;
+ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
+ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+ENABLE_FTL_JIT_macosx_1080 = ;
+ENABLE_FTL_JIT_macosx_1090 = ;
+ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
+
ENABLE_LLINT_C_LOOP = ;
FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_SHAPE_INSIDE) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
Modified: trunk/Tools/ChangeLog (163673 => 163674)
--- trunk/Tools/ChangeLog 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Tools/ChangeLog 2014-02-08 02:11:22 UTC (rev 163674)
@@ -1,3 +1,12 @@
+2014-02-06 Filip Pizlo <fpi...@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * Scripts/copy-webkitlibraries-to-product-directory:
+
2014-02-07 Tim Horton <timothy_hor...@apple.com>
Touch Minibrowser for a hopeful build fix.
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (163673 => 163674)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-08 02:02:22 UTC (rev 163673)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-08 02:11:22 UTC (rev 163674)
@@ -24,6 +24,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
use strict;
+use File::Spec;
use FindBin;
use Getopt::Long qw(:config pass_through);
use lib $FindBin::Bin;
@@ -34,6 +35,7 @@
my $wksi = 0;
my $llvmIncludePackage = "";
my $llvmLibraryPackage = "";
+my $useFullLibPaths = 0;
my $programName = basename($0);
my $usage = <<EOF;
@@ -43,6 +45,7 @@
--[no-]wksi Toggle copying WebKitSystemInterface drops (default: $wksi)
--use-llvm-includes=<path> Get the LLVM inludes package from <path>
--use-llvm-libraries=<path> Get the LLVM libraries package from <path>
+ --[no-]use-full-lib-paths Toggle using full library paths
EOF
GetOptions(
@@ -51,6 +54,7 @@
'wksi!' => \$wksi,
'use-llvm-includes=s' => \$llvmIncludePackage,
'use-llvm-libraries=s' => \$llvmLibraryPackage,
+ 'use-full-lib-paths!' => \$useFullLibPaths
);
if ($showHelp) {
@@ -59,7 +63,11 @@
}
my $productDir = shift @ARGV;
-$productDir = $ENV{BUILT_PRODUCTS_DIR} if !$productDir;
+if ($productDir) {
+ $productDir = File::Spec->rel2abs($productDir);
+} else {
+ $productDir = $ENV{BUILT_PRODUCTS_DIR};
+}
chdirWebKit();
@@ -95,6 +103,9 @@
if ($wksi) {
(system("mkdir", "-p", "$productDir/usr/local/include") == 0) or die;
+
+ my $libraryDir = $useFullLibPaths ? "$productDir/usr/local/lib" : $productDir;
+ (system("mkdir", "-p", $libraryDir) == 0) or die;
my @librariesToCopy = (
"libWebKitSystemInterfaceLion.a",
@@ -104,7 +115,7 @@
foreach my $libName (@librariesToCopy) {
my $srcLib = "WebKitLibraries/" . $libName;
- my $lib = "$productDir/" . $libName;
+ my $lib = "$libraryDir/" . $libName;
if (!-e $lib || -M $lib > -M $srcLib) {
print "Updating $lib\n";
(system("ditto", $srcLib, $lib) == 0) or die;
@@ -118,6 +129,9 @@
if ($llvm) {
(system("mkdir", "-p", "$productDir/usr/local/LLVMForJavaScriptCore/include") == 0) or die;
+ my $libraryDir = $useFullLibPaths ? "$productDir/usr/local/LLVMForJavaScriptCore/lib" : $productDir;
+ (system("mkdir", "-p", $libraryDir) == 0) or die;
+
# Determine where to get LLVM binaries and headers.
my $majorDarwinVersion = (split /\./, `uname -r`)[0];
my $useOwnLLVM = 0;
@@ -199,7 +213,7 @@
}
my $librarySourceDirectory = "$ownLLVMDirectory/$ownLLVMBuildMode/lib";
- my $libraryTargetDirectory = $productDir;
+ my $libraryTargetDirectory = $libraryDir;
$shouldUpdateLLVMLibraryToken = 0;
print("Symlinking libraries from $librarySourceDirectory to $libraryTargetDirectory\n");
opendir (my $dirHandle, $librarySourceDirectory);
@@ -226,7 +240,7 @@
closedir $dirHandle;
} else {
$shouldUpdateLLVMLibraryToken =
- unpackIfNecessary($productDir, "$productDir/libLLVMCore.a", $llvmLibraryPackage, 1);
+ unpackIfNecessary($libraryDir, "$libraryDir/libLLVMCore.a", $llvmLibraryPackage, 1);
}
if ($useOwnLLVM) {
@@ -238,11 +252,8 @@
unpackIfNecessary("$productDir/usr/local/LLVMForJavaScriptCore/include", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c/Core.h", $llvmIncludePackage, 0);
}
- my $llvmLibraryToken = "$productDir/usr/local/LLVMForJavaScriptCore/include/WebKitLLVMLibraryToken.h";
- if ($shouldUpdateLLVMLibraryToken || !-e $llvmLibraryToken) {
- (open my $fileHandle, ">", $llvmLibraryToken) or die;
- print {$fileHandle} "/* This file fools WebKit's build system into relinking _javascript_Core if the LLVM libraries changed. */\n";
- close $fileHandle;
+ if ($shouldUpdateLLVMLibraryToken) {
+ (system("touch", "Source/_javascript_Core/llvm/library/LLVMAnchor.cpp") == 0) or die;
}
}
