<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163678] tags/Safari-538.16.3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163678">163678</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 18:23:44 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/163674">r163674</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538163SourceJavaScriptCoreChangeLog">tags/Safari-538.16.3/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari538163SourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">tags/Safari-538.16.3/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari538163SourceJavaScriptCorellvmlibraryLLVMAnchorcpp">tags/Safari-538.16.3/Source/JavaScriptCore/llvm/library/LLVMAnchor.cpp</a></li>
<li><a href="#tagsSafari538163SourceWTFChangeLog">tags/Safari-538.16.3/Source/WTF/ChangeLog</a></li>
<li><a href="#tagsSafari538163SourceWTFwtfPlatformh">tags/Safari-538.16.3/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#tagsSafari538163SourceWebCoreChangeLog">tags/Safari-538.16.3/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari538163SourceWebCoreConfigurationsFeatureDefinesxcconfig">tags/Safari-538.16.3/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari538163SourceWebKitmacChangeLog">tags/Safari-538.16.3/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#tagsSafari538163SourceWebKitmacConfigurationsFeatureDefinesxcconfig">tags/Safari-538.16.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari538163SourceWebKit2ChangeLog">tags/Safari-538.16.3/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari538163SourceWebKit2ConfigurationsFeatureDefinesxcconfig">tags/Safari-538.16.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari538163ToolsChangeLog">tags/Safari-538.16.3/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari538163ToolsScriptscopywebkitlibrariestoproductdirectory">tags/Safari-538.16.3/Tools/Scripts/copy-webkitlibraries-to-product-directory</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538163SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/JavaScriptCore/ChangeLog (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/JavaScriptCore/ChangeLog 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/JavaScriptCore/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-02-07 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r163674
+
+ 2014-02-06 Filip Pizlo <fpizlo@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 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r163342
</span><span class="cx">
</span><span class="cx"> 2014-02-03 Michael Saboff <msaboff@apple.com>
</span></span></pre></div>
<a id="tagsSafari538163SourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -192,7 +192,12 @@
</span><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span><del>-ENABLE_FTL_JIT = ;
</del><ins>+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;
+
</ins><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><span class="cx"> 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_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_DIRECTORY_UPLOAD) $(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_IFRAME_SEAMLESS) $(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) $(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));
</span></span></pre></div>
<a id="tagsSafari538163SourceJavaScriptCorellvmlibraryLLVMAnchorcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/JavaScriptCore/llvm/library/LLVMAnchor.cpp (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/JavaScriptCore/llvm/library/LLVMAnchor.cpp 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/JavaScriptCore/llvm/library/LLVMAnchor.cpp 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,13 +23,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config_llvm.h"
-
-#if HAVE(LLVM)
-
</del><span class="cx"> // This is a hack for ensuring that the build system relinks JavaScriptCore if any
</span><del>-// of the LLVM libraries are known to have changed.
-#include "WebKitLLVMLibraryToken.h"
-
-#endif // HAVE(LLVM)
-
</del><ins>+// 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.
</ins></span></pre></div>
<a id="tagsSafari538163SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WTF/ChangeLog (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WTF/ChangeLog 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WTF/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-07 Lucas Forschler <lforschler@apple.com>
+
+ Merge r163674
+
+ 2014-02-06 Filip Pizlo <fpizlo@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2014-02-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Obey "delete this" comments, including deleting String::characters and friends
</span></span></pre></div>
<a id="tagsSafari538163SourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WTF/wtf/Platform.h (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WTF/wtf/Platform.h 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WTF/wtf/Platform.h 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -678,6 +678,12 @@
</span><span class="cx"> #define ENABLE_FTL_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+/* 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
+
</ins><span class="cx"> /* If possible, try to enable the LLVM disassembler. This is optional and we can
</span><span class="cx"> fall back on UDis86 if necessary. */
</span><span class="cx"> #if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86))
</span></span></pre></div>
<a id="tagsSafari538163SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WebCore/ChangeLog (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WebCore/ChangeLog 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WebCore/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-07 Lucas Forschler <lforschler@apple.com>
+
+ Merge r163674
+
+ 2014-02-06 Filip Pizlo <fpizlo@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:
+
</ins><span class="cx"> 2014-02-06 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r163558
</span></span></pre></div>
<a id="tagsSafari538163SourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WebCore/Configurations/FeatureDefines.xcconfig (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -192,7 +192,12 @@
</span><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span><del>-ENABLE_FTL_JIT = ;
</del><ins>+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;
+
</ins><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><span class="cx"> 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_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_DIRECTORY_UPLOAD) $(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_IFRAME_SEAMLESS) $(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) $(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));
</span></span></pre></div>
<a id="tagsSafari538163SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WebKit/mac/ChangeLog (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WebKit/mac/ChangeLog 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WebKit/mac/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-07 Lucas Forschler <lforschler@apple.com>
+
+ Merge r163674
+
+ 2014-02-06 Filip Pizlo <fpizlo@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-01-31 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove inline member functions of FrameSelection that access m_selection
</span></span></pre></div>
<a id="tagsSafari538163SourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -192,7 +192,12 @@
</span><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span><del>-ENABLE_FTL_JIT = ;
</del><ins>+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;
+
</ins><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><span class="cx"> 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_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_DIRECTORY_UPLOAD) $(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_IFRAME_SEAMLESS) $(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) $(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));
</span></span></pre></div>
<a id="tagsSafari538163SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WebKit2/ChangeLog (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WebKit2/ChangeLog 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WebKit2/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-07 Lucas Forschler <lforschler@apple.com>
+
+ Merge r163674
+
+ 2014-02-06 Filip Pizlo <fpizlo@apple.com>
+
+ More FTL build scaffolding
+ https://bugs.webkit.org/show_bug.cgi?id=128330
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-02-06 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r163504
</span></span></pre></div>
<a id="tagsSafari538163SourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -192,7 +192,12 @@
</span><span class="cx"> ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;
</span><span class="cx"> ENABLE_XSLT = ENABLE_XSLT;
</span><span class="cx">
</span><del>-ENABLE_FTL_JIT = ;
</del><ins>+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;
+
</ins><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><span class="cx"> 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_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_DIRECTORY_UPLOAD) $(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_IFRAME_SEAMLESS) $(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) $(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));
</span></span></pre></div>
<a id="tagsSafari538163ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Tools/ChangeLog (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Tools/ChangeLog 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Tools/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-07 Lucas Forschler <lforschler@apple.com>
+
+ Merge r163674
+
+ 2014-02-06 Filip Pizlo <fpizlo@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:
+
</ins><span class="cx"> 2014-02-06 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r163481
</span></span></pre></div>
<a id="tagsSafari538163ToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.3/Tools/Scripts/copy-webkitlibraries-to-product-directory (163677 => 163678)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.3/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-08 02:19:42 UTC (rev 163677)
+++ tags/Safari-538.16.3/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-08 02:23:44 UTC (rev 163678)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> use strict;
</span><ins>+use File::Spec;
</ins><span class="cx"> use FindBin;
</span><span class="cx"> use Getopt::Long qw(:config pass_through);
</span><span class="cx"> use lib $FindBin::Bin;
</span><span class="lines">@@ -34,6 +35,7 @@
</span><span class="cx"> my $wksi = 0;
</span><span class="cx"> my $llvmIncludePackage = "";
</span><span class="cx"> my $llvmLibraryPackage = "";
</span><ins>+my $useFullLibPaths = 0;
</ins><span class="cx">
</span><span class="cx"> my $programName = basename($0);
</span><span class="cx"> my $usage = <<EOF;
</span><span class="lines">@@ -43,6 +45,7 @@
</span><span class="cx"> --[no-]wksi Toggle copying WebKitSystemInterface drops (default: $wksi)
</span><span class="cx"> --use-llvm-includes=<path> Get the LLVM inludes package from <path>
</span><span class="cx"> --use-llvm-libraries=<path> Get the LLVM libraries package from <path>
</span><ins>+ --[no-]use-full-lib-paths Toggle using full library paths
</ins><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> GetOptions(
</span><span class="lines">@@ -51,6 +54,7 @@
</span><span class="cx"> 'wksi!' => \$wksi,
</span><span class="cx"> 'use-llvm-includes=s' => \$llvmIncludePackage,
</span><span class="cx"> 'use-llvm-libraries=s' => \$llvmLibraryPackage,
</span><ins>+ 'use-full-lib-paths!' => \$useFullLibPaths
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ($showHelp) {
</span><span class="lines">@@ -59,7 +63,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $productDir = shift @ARGV;
</span><del>-$productDir = $ENV{BUILT_PRODUCTS_DIR} if !$productDir;
</del><ins>+if ($productDir) {
+ $productDir = File::Spec->rel2abs($productDir);
+} else {
+ $productDir = $ENV{BUILT_PRODUCTS_DIR};
+}
</ins><span class="cx">
</span><span class="cx"> chdirWebKit();
</span><span class="cx">
</span><span class="lines">@@ -95,6 +103,9 @@
</span><span class="cx">
</span><span class="cx"> if ($wksi) {
</span><span class="cx"> (system("mkdir", "-p", "$productDir/usr/local/include") == 0) or die;
</span><ins>+
+ my $libraryDir = $useFullLibPaths ? "$productDir/usr/local/lib" : $productDir;
+ (system("mkdir", "-p", $libraryDir) == 0) or die;
</ins><span class="cx">
</span><span class="cx"> my @librariesToCopy = (
</span><span class="cx"> "libWebKitSystemInterfaceLion.a",
</span><span class="lines">@@ -104,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> foreach my $libName (@librariesToCopy) {
</span><span class="cx"> my $srcLib = "WebKitLibraries/" . $libName;
</span><del>- my $lib = "$productDir/" . $libName;
</del><ins>+ my $lib = "$libraryDir/" . $libName;
</ins><span class="cx"> if (!-e $lib || -M $lib > -M $srcLib) {
</span><span class="cx"> print "Updating $lib\n";
</span><span class="cx"> (system("ditto", $srcLib, $lib) == 0) or die;
</span><span class="lines">@@ -118,6 +129,9 @@
</span><span class="cx"> if ($llvm) {
</span><span class="cx"> (system("mkdir", "-p", "$productDir/usr/local/LLVMForJavaScriptCore/include") == 0) or die;
</span><span class="cx">
</span><ins>+ my $libraryDir = $useFullLibPaths ? "$productDir/usr/local/LLVMForJavaScriptCore/lib" : $productDir;
+ (system("mkdir", "-p", $libraryDir) == 0) or die;
+
</ins><span class="cx"> # Determine where to get LLVM binaries and headers.
</span><span class="cx"> my $majorDarwinVersion = (split /\./, `uname -r`)[0];
</span><span class="cx"> my $useOwnLLVM = 0;
</span><span class="lines">@@ -199,7 +213,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $librarySourceDirectory = "$ownLLVMDirectory/$ownLLVMBuildMode/lib";
</span><del>- my $libraryTargetDirectory = $productDir;
</del><ins>+ my $libraryTargetDirectory = $libraryDir;
</ins><span class="cx"> $shouldUpdateLLVMLibraryToken = 0;
</span><span class="cx"> print("Symlinking libraries from $librarySourceDirectory to $libraryTargetDirectory\n");
</span><span class="cx"> opendir (my $dirHandle, $librarySourceDirectory);
</span><span class="lines">@@ -226,7 +240,7 @@
</span><span class="cx"> closedir $dirHandle;
</span><span class="cx"> } else {
</span><span class="cx"> $shouldUpdateLLVMLibraryToken =
</span><del>- unpackIfNecessary($productDir, "$productDir/libLLVMCore.a", $llvmLibraryPackage, 1);
</del><ins>+ unpackIfNecessary($libraryDir, "$libraryDir/libLLVMCore.a", $llvmLibraryPackage, 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($useOwnLLVM) {
</span><span class="lines">@@ -238,11 +252,8 @@
</span><span class="cx"> unpackIfNecessary("$productDir/usr/local/LLVMForJavaScriptCore/include", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c/Core.h", $llvmIncludePackage, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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 JavaScriptCore if the LLVM libraries changed. */\n";
- close $fileHandle;
</del><ins>+ if ($shouldUpdateLLVMLibraryToken) {
+ (system("touch", "Source/JavaScriptCore/llvm/library/LLVMAnchor.cpp") == 0) or die;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>