Update LLVM binary drops and scripts to the latest version from SVN

https://bugs.webkit.org/show_bug.cgi?id=120184

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::compileInThreadImpl):

Tools:

* ReducedFTL/build.sh:
* Scripts/configure-llvm: Added.
* Scripts/copy-webkitlibraries-to-product-directory:
* Scripts/export-llvm-build:

WebKitLibraries:

Updated binary drops to r189066.

* LLVMIncludesMountainLion.tar.bz2:
* LLVMLibrariesMountainLion.tar.bz2:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index a58f01c7a88dd6317c7b5ba35d3e02dbe21cdd80..8357eabebe1deb101c5cf3a55222cc194b5f6cd1 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2013-08-22  Filip Pizlo  <fpizlo@apple.com>
+
+        Update LLVM binary drops and scripts to the latest version from SVN
+        https://bugs.webkit.org/show_bug.cgi?id=120184
+
+        Reviewed by Mark Hahnenberg.
+
+        * dfg/DFGPlan.cpp:
+        (JSC::DFG::Plan::compileInThreadImpl):
+
 2013-08-22  Gavin Barraclough  <barraclough@apple.com>
 
         Don't leak registers for redeclared variables

diff --git a/Source/JavaScriptCore/dfg/DFGPlan.cpp b/Source/JavaScriptCore/dfg/DFGPlan.cpp
index 22c19f854a888b6edb0b8986fd669473942456de..59f37908a7b7ee4782f8566aa7a718634326f83c 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGPlan.cpp
+++ b/Source/JavaScriptCore/dfg/DFGPlan.cpp
@@ -245,6 +245,8 @@ Plan::CompilationPath Plan::compileInThreadImpl(LongLivedState& longLivedState)
         FTL::link(state);
         return FTLPath;
     }
+#else
+    RELEASE_ASSERT(!Options::useExperimentalFTL());
 #endif // ENABLE(FTL_JIT)
     
     performCPSRethreading(dfg);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 80543438a2c983d2e82897b75247cfd743d8118f..f4882f8fef3bdd8bab202671309f1fc0b5bf7c78 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2013-08-22  Filip Pizlo  <fpizlo@apple.com>
+
+        Update LLVM binary drops and scripts to the latest version from SVN
+        https://bugs.webkit.org/show_bug.cgi?id=120184
+
+        Reviewed by Mark Hahnenberg.
+
+        * ReducedFTL/build.sh:
+        * Scripts/configure-llvm: Added.
+        * Scripts/copy-webkitlibraries-to-product-directory:
+        * Scripts/export-llvm-build:
+
 2013-08-22  Andy Estes  <aestes@apple.com>
 
         <https://webkit.org/b/120180> Fix issues with OTHER_LDFLAGS in various .xcconfig files

diff --git a/Tools/ReducedFTL/build.sh b/Tools/ReducedFTL/build.sh
index 26363ea68a247ef531277ee691ddf0343658d4fa..084dd8e06eae5f232dadacc21f76f309cdad77eb 100755 (executable)
--- a/Tools/ReducedFTL/build.sh
+++ b/Tools/ReducedFTL/build.sh
@@ -11,4 +11,4 @@ else
 fi
 
 clang -c -o ReducedFTL.o ReducedFTL.c `${configPath} --cppflags --cflags`
-clang++ -o ReducedFTL ReducedFTL.o -stdlib=libc++ `${configPath} --ldflags --libs`
+clang++ -o ReducedFTL ReducedFTL.o -stdlib=libc++ `${configPath} --ldflags --libs` -lcurses

diff --git a/Tools/Scripts/configure-llvm b/Tools/Scripts/configure-llvm
new file mode 100755 (executable)
index 0000000..d764560
--- /dev/null
+++ b/Tools/Scripts/configure-llvm
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# Copyright (C) 2013 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer. 
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution. 
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+set -e
+set -x
+
+if test "x$1" != "x"
+then
+    cd $1
+fi
+
+# Configure LLVM for a Release+Asserts build that only includes the x86_64 backend, uses
+# libcpp (because that's what WebKit uses), and doesn't depend on either zlib or curses.
+# In the future it will be appropriate to parameterize what backends should be built (we
+# only want to build a backend for our current target) and to add more flags to remove
+# dependencies and features.
+
+./configure --enable-optimized=yes --enable-backtraces=no --enable-targets=x86_64 --enable-libcpp=yes --enable-zlib=no --enable-terminfo=no

diff --git a/Tools/Scripts/copy-webkitlibraries-to-product-directory b/Tools/Scripts/copy-webkitlibraries-to-product-directory
index bd5047216a7324bf9204089689e09e370a743802..ebae458dbc9a049cdd6ef1a316cd7a8e844c199c 100755 (executable)
--- a/Tools/Scripts/copy-webkitlibraries-to-product-directory
+++ b/Tools/Scripts/copy-webkitlibraries-to-product-directory
@@ -138,11 +138,9 @@ if ($ENV{ENABLE_FTL_JIT}) {
     my $shouldUpdateLLVMLibraryToken = 0;
 
     if ($useOwnLLVM) {
-
-        chdir $ownLLVMDirectory;
-        if (!-e "Makefile.config") {
+        if (!-e "$ownLLVMDirectory/Makefile.config") {
             print("Configuring LLVM.\n");
-            (system("./configure --enable-optimized=yes --enable-backtraces=no --enable-targets=x86_64 --enable-libcpp=yes --enable-zlib=no")==0) or die;
+            (system("sh", "Tools/Scripts/configure-llvm", $ownLLVMDirectory)==0) or die;
         }
 
         print("Building LLVM.\n");

diff --git a/Tools/Scripts/export-llvm-build b/Tools/Scripts/export-llvm-build
index 7eb39948c3432968f23b14d610066551e6170697..7946d93ae361fc6bfdd901b4f019fd5f03ad2c43 100755 (executable)
--- a/Tools/Scripts/export-llvm-build
+++ b/Tools/Scripts/export-llvm-build
@@ -98,7 +98,11 @@ def compressionChar
 end
 
 Dir.chdir($llvmPath + $llvmBuild + "lib") {
-    mysys("tar", "-c#{compressionChar}vf", $currentPath + $libraryPackage, *Dir.entries('.').select{|value| value =~ /\.a$/})
+    mysys("tar", "-c#{compressionChar}vf", $currentPath + $libraryPackage,
+          *Dir.entries('.').select {
+              | value |
+              value =~ /\.a$/ and value !~ /libgtest/
+          })
 }
 
 Dir.mktmpdir {

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 15c282d5b5849e81bd2807df980fb3b25b32ed13..c80a766acb1a6e8d2b5f67660b702b2c02bc5bf8 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,15 @@
+2013-08-22  Filip Pizlo  <fpizlo@apple.com>
+
+        Update LLVM binary drops and scripts to the latest version from SVN
+        https://bugs.webkit.org/show_bug.cgi?id=120184
+
+        Reviewed by Mark Hahnenberg.
+
+        Updated binary drops to r189066.
+
+        * LLVMIncludesMountainLion.tar.bz2:
+        * LLVMLibrariesMountainLion.tar.bz2:
+
 2013-08-21  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r154416.

diff --git a/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2 b/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2
index f0ec460cf23f0504da18d131a53a5a210bc7d5fd..b3dcbb6609c743eeefad40202ba7105767a19f92 100644 (file)
Binary files a/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2 and b/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2 differ

diff --git a/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2 b/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2
index 8595719c96d72b5cb0aaac367a49302744168aad..8574517b01ac224b2ff7465f067d279b0ac4e1a0 100644 (file)
Binary files a/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2 and b/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2 differ