<!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>[163495] tags/Safari-538.16.2</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/163495">163495</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 16:57:54 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/163474">r163474</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538162SourceJavaScriptCoreChangeLog">tags/Safari-538.16.2/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari538162SourceJavaScriptCoreConfigurationsBasexcconfig">tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#tagsSafari538162SourceJavaScriptCoreConfigurationsLLVMForJSCxcconfig">tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig</a></li>
<li><a href="#tagsSafari538162ToolsChangeLog">tags/Safari-538.16.2/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari538162ToolsScriptscopywebkitlibrariestoproductdirectory">tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538162SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Source/JavaScriptCore/ChangeLog (163494 => 163495)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Source/JavaScriptCore/ChangeLog 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Source/JavaScriptCore/ChangeLog 2014-02-06 00:57:54 UTC (rev 163495)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-02-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r163474
+
+ 2014-02-05 Filip Pizlo <fpizlo@apple.com>
+
+ JSC on Mac should pull LLVM from prefix=/usr/local/LLVMForJavaScriptCore and not /usr/local
+ https://bugs.webkit.org/show_bug.cgi?id=128269
+
+ Reviewed by Mark Hahnenberg.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/LLVMForJSC.xcconfig:
+
+2014-02-05 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r163473
</span><span class="cx">
</span><span class="cx"> 2014-02-05 Mark Hahnenberg <mhahnenberg@apple.com>
</span></span></pre></div>
<a id="tagsSafari538162SourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/Base.xcconfig (163494 => 163495)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/Base.xcconfig 2014-02-06 00:57:54 UTC (rev 163495)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> LINKER_DISPLAYS_MANGLED_NAMES = YES;
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</span><del>-HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
</del><ins>+HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include" /usr/local/LLVMForJavaScriptCore/include "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
</ins><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538162SourceJavaScriptCoreConfigurationsLLVMForJSCxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig (163494 => 163495)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig 2014-02-06 00:57:54 UTC (rev 163495)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_LLVM = $(OTHER_LDFLAGS_LLVM_$(ENABLE_FTL_JIT));
</span><span class="cx"> OTHER_LDFLAGS_LLVM_ = ;
</span><del>-OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
</del><ins>+OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm -L/usr/local/LLVMForJavaScriptCore/lib -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
</ins><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
</span></span></pre></div>
<a id="tagsSafari538162ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Tools/ChangeLog (163494 => 163495)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Tools/ChangeLog 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Tools/ChangeLog 2014-02-06 00:57:54 UTC (rev 163495)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-02-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r163474
+
+ 2014-02-05 Filip Pizlo <fpizlo@apple.com>
+
+ JSC on Mac should pull LLVM from prefix=/usr/local/LLVMForJavaScriptCore and not /usr/local
+ https://bugs.webkit.org/show_bug.cgi?id=128269
+
+ Reviewed by Mark Hahnenberg.
+
+ * Scripts/copy-webkitlibraries-to-product-directory:
+
+2014-02-05 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r163423
</span><span class="cx">
</span><span class="cx"> 2014-02-04 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="tagsSafari538162ToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory (163494 => 163495)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-06 00:54:30 UTC (rev 163494)
+++ tags/Safari-538.16.2/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-02-06 00:57:54 UTC (rev 163495)
</span><span class="lines">@@ -93,11 +93,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ($llvm || $wksi) {
</del><ins>+if ($wksi) {
</ins><span class="cx"> (system("mkdir", "-p", "$productDir/usr/local/include") == 0) or die;
</span><del>-}
</del><span class="cx">
</span><del>-if ($wksi) {
</del><span class="cx"> my @librariesToCopy = (
</span><span class="cx"> "libWebKitSystemInterfaceLion.a",
</span><span class="cx"> "libWebKitSystemInterfaceMountainLion.a",
</span><span class="lines">@@ -118,6 +116,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($llvm) {
</span><ins>+ (system("mkdir", "-p", "$productDir/usr/local/LLVMForJavaScriptCore/include") == 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">@@ -230,15 +230,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($useOwnLLVM) {
</span><del>- (system("rm", "-rf", "$productDir/usr/local/include/llvm") == 0) or die;
- (system("rm", "-rf", "$productDir/usr/local/include/llvm-c") == 0) or die;
- symlink("$ownLLVMDirectory/include/llvm", "$productDir/usr/local/include/llvm") or die;
- symlink("$ownLLVMDirectory/include/llvm-c", "$productDir/usr/local/include/llvm-c") or die;
</del><ins>+ (system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") == 0) or die;
+ (system("rm", "-rf", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") == 0) or die;
+ symlink("$ownLLVMDirectory/include/llvm", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm") or die;
+ symlink("$ownLLVMDirectory/include/llvm-c", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c") or die;
</ins><span class="cx"> } else {
</span><del>- unpackIfNecessary("$productDir/usr/local/include", "$productDir/usr/local/include/llvm-c/Core.h", $llvmIncludePackage, 0);
</del><ins>+ unpackIfNecessary("$productDir/usr/local/LLVMForJavaScriptCore/include", "$productDir/usr/local/LLVMForJavaScriptCore/include/llvm-c/Core.h", $llvmIncludePackage, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- my $llvmLibraryToken = "$productDir/usr/local/include/WebKitLLVMLibraryToken.h";
</del><ins>+ my $llvmLibraryToken = "$productDir/usr/local/LLVMForJavaScriptCore/include/WebKitLLVMLibraryToken.h";
</ins><span class="cx"> if ($shouldUpdateLLVMLibraryToken || !-e $llvmLibraryToken) {
</span><span class="cx"> (open my $fileHandle, ">", $llvmLibraryToken) or die;
</span><span class="cx"> print {$fileHandle} "/* This file fools WebKit's build system into relinking JavaScriptCore if the LLVM libraries changed. */\n";
</span></span></pre>
</div>
</div>
</body>
</html>