From 28d7e29493c2f62f06625211bca46fbe6cc0e452 Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Thu, 7 Jun 2018 11:16:01 +0300 Subject: [PATCH] Backed out 2 changesets (bug 1462498) for build bustages on unit-symbolstore.py. CLOSED TREE Backed out changeset 213ee9ed734c (bug 1462498) Backed out changeset 556f097431e3 (bug 1462498) --- ...-linux64.json => clang-6-pre-linux64.json} | 14 ++++---- ...acosx64.json => clang-6-pre-macosx64.json} | 15 +++++---- build/build-clang/r321543.patch | 33 +++++++++++++++++++ taskcluster/ci/build/linux.yml | 12 +++---- taskcluster/ci/build/macosx.yml | 4 +-- taskcluster/ci/spidermonkey/linux.yml | 2 +- taskcluster/ci/toolchain/linux.yml | 22 ++++++------- ...> build-clang-6-pre-linux-macosx-cross.sh} | 2 +- ...-6-linux.sh => build-clang-6-pre-linux.sh} | 2 +- 9 files changed, 70 insertions(+), 36 deletions(-) rename build/build-clang/{clang-6-linux64.json => clang-6-pre-linux64.json} (57%) rename build/build-clang/{clang-6-macosx64.json => clang-6-pre-macosx64.json} (71%) create mode 100644 build/build-clang/r321543.patch rename taskcluster/scripts/misc/{build-clang-6-linux-macosx-cross.sh => build-clang-6-pre-linux-macosx-cross.sh} (95%) rename taskcluster/scripts/misc/{build-clang-6-linux.sh => build-clang-6-pre-linux.sh} (86%) diff --git a/build/build-clang/clang-6-linux64.json b/build/build-clang/clang-6-pre-linux64.json similarity index 57% rename from build/build-clang/clang-6-linux64.json rename to build/build-clang/clang-6-pre-linux64.json index b51f9204f0a2..b22d00e2f93a 100644 --- a/build/build-clang/clang-6-linux64.json +++ b/build/build-clang/clang-6-pre-linux64.json @@ -1,15 +1,15 @@ { - "llvm_revision": "326563", + "llvm_revision": "317840", "stages": "3", "build_libcxx": true, "build_type": "Release", "assertions": false, - "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_600/final", - "clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_600/final", - "lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_600/final", - "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_600/final", - "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_600/final", - "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_600/final", + "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/trunk", + "clang_repo": "https://llvm.org/svn/llvm-project/cfe/trunk", + "lld_repo": "https://llvm.org/svn/llvm-project/lld/trunk", + "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk", + "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk", + "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/trunk", "python_path": "/usr/bin/python2.7", "gcc_dir": "/builds/worker/workspace/build/src/gcc", "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc", diff --git a/build/build-clang/clang-6-macosx64.json b/build/build-clang/clang-6-pre-macosx64.json similarity index 71% rename from build/build-clang/clang-6-macosx64.json rename to build/build-clang/clang-6-pre-macosx64.json index e95700b1fbd6..c9c128e29a6c 100644 --- a/build/build-clang/clang-6-macosx64.json +++ b/build/build-clang/clang-6-pre-macosx64.json @@ -1,15 +1,15 @@ { - "llvm_revision": "326563", + "llvm_revision": "317840", "stages": "1", "build_libcxx": true, "build_type": "Release", "assertions": false, "osx_cross_compile": true, - "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_600/final", - "clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_600/final", - "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_600/final", - "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_600/final", - "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_600/final", + "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/trunk", + "clang_repo": "https://llvm.org/svn/llvm-project/cfe/trunk", + "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk", + "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk", + "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/trunk", "python_path": "/usr/bin/python2.7", "gcc_dir": "/builds/worker/workspace/build/src/gcc", "cc": "/builds/worker/workspace/build/src/clang/bin/clang", @@ -21,6 +21,7 @@ "ld": "/builds/worker/workspace/build/src/clang/bin/clang", "patches": [ "compiler-rt-cross-compile.patch", - "compiler-rt-no-codesign.patch" + "compiler-rt-no-codesign.patch", + "r321543.patch" ] } diff --git a/build/build-clang/r321543.patch b/build/build-clang/r321543.patch new file mode 100644 index 000000000000..bb66cf2b2463 --- /dev/null +++ b/build/build-clang/r321543.patch @@ -0,0 +1,33 @@ +From: Yi Kong +Date: Thu, 28 Dec 2017 23:06:24 +0000 +Subject: [PATCH] Ignore the DISPATCH_NOESCAPE if not defined + +This macro is only defined after XCode 8, causing build breakage for +build systems with prior versions. Ignore DISPATCH_NOESCAPE if not +defined. + +Differential Revision: https://reviews.llvm.org/D41601 + + +git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@321543 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/tsan/rtl/tsan_libdispatch_mac.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/tsan/rtl/tsan_libdispatch_mac.cc b/lib/tsan/rtl/tsan_libdispatch_mac.cc +index eb22e4baa..d6c1ca662 100644 +--- a/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc ++++ b/compiler-rt/lib/tsan/rtl/tsan_libdispatch_mac.cc +@@ -25,6 +25,11 @@ + #include + #include + ++// DISPATCH_NOESCAPE is not defined prior to XCode 8. ++#ifndef DISPATCH_NOESCAPE ++#define DISPATCH_NOESCAPE ++#endif ++ + typedef long long_t; // NOLINT + + namespace __tsan { + diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index b5e16f8c2f10..7c60700cb55b 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -542,7 +542,7 @@ linux64-asan/opt: tooltool-downloads: public need-xvfb: true toolchains: - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc - linux64-rust - linux64-sccache @@ -573,7 +573,7 @@ linux64-asan-fuzzing/opt: tooltool-downloads: public need-xvfb: true toolchains: - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc - linux64-rust - linux64-sccache @@ -607,7 +607,7 @@ linux64-asan-reporter-nightly/opt: tooltool-downloads: public need-xvfb: true toolchains: - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc - linux64-rust - linux64-sccache @@ -637,7 +637,7 @@ linux64-asan/debug: tooltool-downloads: public need-xvfb: true toolchains: - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc - linux64-rust - linux64-sccache @@ -668,7 +668,7 @@ linux64-lto/opt: tooltool-downloads: public need-xvfb: true toolchains: - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc - linux64-rust - linux64-sccache @@ -699,7 +699,7 @@ linux64-lto/debug: tooltool-downloads: public need-xvfb: true toolchains: - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc - linux64-rust - linux64-sccache diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index e6e7f86de633..0ee43b552e81 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -89,7 +89,7 @@ macosx64-asan-fuzzing/opt: tooltool-downloads: internal toolchains: - linux64-cctools-port - - linux64-clang-6-macosx-cross + - linux64-clang-6-pre-macosx-cross - linux64-hfsplus - linux64-libdmg - linux64-llvm-dsymutil @@ -305,7 +305,7 @@ macosx64-ccov/debug: run-on-projects: ['try'] toolchains: - linux64-cctools-port - - linux64-clang-6-macosx-cross + - linux64-clang-6-pre-macosx-cross - linux64-hfsplus - linux64-libdmg - linux64-llvm-dsymutil diff --git a/taskcluster/ci/spidermonkey/linux.yml b/taskcluster/ci/spidermonkey/linux.yml index 7e09cac9b35a..5de4b305c857 100644 --- a/taskcluster/ci/spidermonkey/linux.yml +++ b/taskcluster/ci/spidermonkey/linux.yml @@ -169,6 +169,6 @@ sm-fuzzing-linux64/opt: run: spidermonkey-variant: fuzzing toolchains: - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc - linux64-rust diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml index 76a3347e02dd..ab4bc23a987f 100755 --- a/taskcluster/ci/toolchain/linux.yml +++ b/taskcluster/ci/toolchain/linux.yml @@ -70,33 +70,33 @@ linux64-clang-5: toolchains: - linux64-gcc-4.9 -linux64-clang-6: - description: "Clang 6 toolchain build" +linux64-clang-6-pre: + description: "Clang 6 Pre toolchain build" treeherder: kind: build platform: toolchains/opt - symbol: TL(clang6) + symbol: TL(clang6p) tier: 1 worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge worker: max-run-time: 7200 run: using: toolchain-script - script: build-clang-6-linux.sh + script: build-clang-6-pre-linux.sh resources: - 'build/build-clang/build-clang.py' - - 'build/build-clang/clang-6-linux64.json' + - 'build/build-clang/clang-6-pre-linux64.json' - 'taskcluster/scripts/misc/tooltool-download.sh' toolchain-artifact: public/build/clang.tar.xz toolchains: - linux64-gcc-4.9 -linux64-clang-6-macosx-cross: - description: "Clang 6 toolchain build with MacOS Compiler RT libs" +linux64-clang-6-pre-macosx-cross: + description: "Clang 6 Pre toolchain build with MacOS Compiler RT libs" treeherder: kind: build platform: toolchains/opt - symbol: TL(clang6-macosx-cross) + symbol: TL(clang6p-macosx-cross) tier: 1 worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: @@ -105,16 +105,16 @@ linux64-clang-6-macosx-cross: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest" run: using: toolchain-script - script: build-clang-6-linux-macosx-cross.sh + script: build-clang-6-pre-linux-macosx-cross.sh resources: - 'build/build-clang/build-clang.py' - - 'build/build-clang/clang-6-macosx64.json' + - 'build/build-clang/clang-6-pre-macosx64.json' - 'taskcluster/scripts/misc/tooltool-download.sh' toolchain-artifact: public/build/clang.tar.xz tooltool-downloads: internal toolchains: - linux64-cctools-port - - linux64-clang-6 + - linux64-clang-6-pre - linux64-gcc-4.9 linux64-clang-tidy: diff --git a/taskcluster/scripts/misc/build-clang-6-linux-macosx-cross.sh b/taskcluster/scripts/misc/build-clang-6-pre-linux-macosx-cross.sh similarity index 95% rename from taskcluster/scripts/misc/build-clang-6-linux-macosx-cross.sh rename to taskcluster/scripts/misc/build-clang-6-pre-linux-macosx-cross.sh index 2f5d3653e771..767027f1f1fe 100755 --- a/taskcluster/scripts/misc/build-clang-6-linux-macosx-cross.sh +++ b/taskcluster/scripts/misc/build-clang-6-pre-linux-macosx-cross.sh @@ -25,7 +25,7 @@ set +x cd build/build-clang # |mach python| sets up a virtualenv for us! -../../mach python ./build-clang.py -c clang-6-macosx64.json --skip-tar +../../mach python ./build-clang.py -c clang-6-pre-macosx64.json --skip-tar # We now have a native macosx64 toolchain. # What we want is a native linux64 toolchain which can target macosx64 and use the sanitizer dylibs. diff --git a/taskcluster/scripts/misc/build-clang-6-linux.sh b/taskcluster/scripts/misc/build-clang-6-pre-linux.sh similarity index 86% rename from taskcluster/scripts/misc/build-clang-6-linux.sh rename to taskcluster/scripts/misc/build-clang-6-pre-linux.sh index 5a887e26e048..b382dd43ecef 100755 --- a/taskcluster/scripts/misc/build-clang-6-linux.sh +++ b/taskcluster/scripts/misc/build-clang-6-pre-linux.sh @@ -16,7 +16,7 @@ set +x cd build/build-clang # |mach python| sets up a virtualenv for us! -../../mach python ./build-clang.py -c clang-6-linux64.json +../../mach python ./build-clang.py -c clang-6-pre-linux64.json set -x