Backout changeset b0abf5269c25 (bug 1492037) to give time to toolchains to build without blocking other landings.
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 19 Sep 2018 06:58:26 +0900
changeset 492899 ceff48930273e4a3d98873aa38fe2fa440a9da80
parent 492898 b0abf5269c25eae290453d4180e1120920d47b46
child 492900 4273ad7bbdf434221e28e6e8889f8a4564a0bb9f
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1492037
milestone64.0a1
backs outb0abf5269c25eae290453d4180e1120920d47b46
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout changeset b0abf5269c25 (bug 1492037) to give time to toolchains to build without blocking other landings.
build/build-clang/build-clang.py
build/build-clang/clang-3.9-linux64.json
build/build-clang/clang-6-linux64.json
build/build-clang/clang-6-macosx64.json
build/build-clang/clang-7-pre-linux64.json
build/build-clang/static-llvm-symbolizer.patch
taskcluster/scripts/misc/build-cctools-port-macosx.sh
taskcluster/scripts/misc/build-cctools-port.sh
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -217,19 +217,16 @@ def build_one_stage(cc, cxx, asm, ld, ar
             "-DLLVM_TOOL_LIBCXX_BUILD=%s" % ("ON" if build_libcxx else "OFF"),
             "-DLIBCXX_LIBCPPABI_VERSION=\"\"",
         ]
         if is_linux():
             cmake_args += ["-DLLVM_BINUTILS_INCDIR=%s/include" % gcc_dir]
         if is_windows():
             cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
             cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
-        else:
-            # libllvm as a shared library is not supported on Windows
-            cmake_args += ["-DLLVM_LINK_LLVM_DYLIB=ON"]
         if ranlib is not None:
             cmake_args += ["-DCMAKE_RANLIB=%s" % slashify_path(ranlib)]
         if libtool is not None:
             cmake_args += ["-DCMAKE_LIBTOOL=%s" % slashify_path(libtool)]
         if osx_cross_compile:
             cmake_args += [
                 "-DCMAKE_SYSTEM_NAME=Darwin",
                 "-DCMAKE_SYSTEM_VERSION=10.10",
--- a/build/build-clang/clang-3.9-linux64.json
+++ b/build/build-clang/clang-3.9-linux64.json
@@ -10,16 +10,15 @@
     "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_391/final",
     "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_391/final",
     "python_path": "/usr/bin/python2.7",
     "gcc_dir": "/builds/worker/workspace/build/src/gcc",
     "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
     "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "llvm-debug-frame.patch",
       "r277806.patch",
       "r285657.patch",
       "r289565-for-3.9.patch",
       "r313872.patch"
     ]
 }
--- a/build/build-clang/clang-6-linux64.json
+++ b/build/build-clang/clang-6-linux64.json
@@ -11,16 +11,15 @@
     "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_601/final",
     "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_601/final",
     "python_path": "/usr/bin/python2.7",
     "gcc_dir": "/builds/worker/workspace/build/src/gcc",
     "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
     "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "find_symbolizer_linux.patch",
       "r322325.patch",
       "r322401.patch",
       "r325356.patch",
       "r339636.patch"
     ]
 }
--- a/build/build-clang/clang-6-macosx64.json
+++ b/build/build-clang/clang-6-macosx64.json
@@ -16,16 +16,15 @@
     "cc": "/builds/worker/workspace/build/src/clang/bin/clang",
     "cxx": "/builds/worker/workspace/build/src/clang/bin/clang++",
     "as": "/builds/worker/workspace/build/src/clang/bin/clang",
     "ar": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ar",
     "ranlib": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ranlib",
     "libtool": "/builds/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-libtool",
     "ld": "/builds/worker/workspace/build/src/clang/bin/clang",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "compiler-rt-cross-compile.patch",
       "compiler-rt-no-codesign.patch",
       "r322401.patch",
       "r325356.patch",
       "r339636.patch"
     ]
 }
--- a/build/build-clang/clang-7-pre-linux64.json
+++ b/build/build-clang/clang-7-pre-linux64.json
@@ -11,13 +11,12 @@
     "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_700/rc2",
     "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_700/rc2",
     "python_path": "/usr/bin/python2.7",
     "gcc_dir": "/builds/worker/workspace/build/src/gcc",
     "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
     "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
     "patches": [
-      "static-llvm-symbolizer.patch",
       "find_symbolizer_linux.patch",
       "rename_gcov_flush.patch"
     ]
 }
deleted file mode 100644
--- a/build/build-clang/static-llvm-symbolizer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/llvm/tools/llvm-symbolizer/CMakeLists.txt b/llvm/tools/llvm-symbolizer/CMakeLists.txt
-index 8185c296c50..13c7419fa47 100644
---- a/llvm/tools/llvm-symbolizer/CMakeLists.txt
-+++ b/llvm/tools/llvm-symbolizer/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(LLVM_LINK_COMPONENTS
-   )
- 
- add_llvm_tool(llvm-symbolizer
-+  DISABLE_LLVM_LINK_LLVM_DYLIB
-   llvm-symbolizer.cpp
-   )
- 
--- a/taskcluster/scripts/misc/build-cctools-port-macosx.sh
+++ b/taskcluster/scripts/misc/build-cctools-port-macosx.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
-
-# cctools sometimes needs to be rebuilt when clang is modified.
-# Until bug 1471905 is addressed, increase the following number
-# when a forced rebuild of cctools is necessary: 1
-
 set -x -e -v
 
 # This script is for building cctools (Apple's binutils) for Mac OS X on
 # Linux using ctools-port (https://github.com/tpoechtrager/cctools-port).
 WORKSPACE=$HOME/workspace
 UPLOAD_DIR=$HOME/artifacts
 
 # Repository info
--- a/taskcluster/scripts/misc/build-cctools-port.sh
+++ b/taskcluster/scripts/misc/build-cctools-port.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
-
-# cctools sometimes needs to be rebuilt when clang is modified.
-# Until bug 1471905 is addressed, increase the following number
-# when a forced rebuild of cctools is necessary: 1
-
 set -x -e -v
 
 # This script is for building cctools (Apple's binutils) for Linux using
 # cctools-port (https://github.com/tpoechtrager/cctools-port).
 WORKSPACE=$HOME/workspace
 UPLOAD_DIR=$HOME/artifacts
 
 # Repository info