Bug 1414287 - Remove now unused win32-clang-cl-st-an toolchain r=dmajor
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 09 Oct 2018 08:40:16 +0000
changeset 496373 0a7a9e17c1ea59f36f3669f07aeadd452acecbb4
parent 496372 ce3b1b7b826fa336d1e8ead8520f55d6fa710dde
child 496374 a5fe00a3b11656f4cc51386913733e51b6617b1a
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)
reviewersdmajor
bugs1414287
milestone64.0a1
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
Bug 1414287 - Remove now unused win32-clang-cl-st-an toolchain r=dmajor Depends on D7845 Differential Revision: https://phabricator.services.mozilla.com/D7846
build/build-clang/clang-win32-st-an.json
build/build-clang/msvc-host-x64.patch
taskcluster/ci/toolchain/windows.yml
taskcluster/scripts/misc/build-clang32-st-an-windows.sh
deleted file mode 100644
--- a/build/build-clang/clang-win32-st-an.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "llvm_revision": "317840",
-    "stages": "3",
-    "build_libcxx": false,
-    "build_type": "Release",
-    "assertions": false,
-    "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",
-    "python_path": "c:/mozilla-build/python/python.exe",
-    "cc": "cl.exe",
-    "cxx": "cl.exe",
-    "patches": [
-      "r318309.patch",
-      "r320462.patch",
-      "msvc-host-x64.patch",
-      "aarch64-vastart-checking.patch",
-      "loosen-msvc-detection.patch"
-    ]
-}
deleted file mode 100644
--- a/build/build-clang/msvc-host-x64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-When looking for a linker, 32-bit clang-cl.exe wants to use the 32-bit-native link.exe located in Hostx86/x86, but this executable does not exist in our releng package, because we only use 64-bit-host toolchains.
-
-This patch makes clang-cl use the Hostx64/x86 linker instead. Ideally we wouldn't be using 32-bit clang-cl.exe in the first place. Bug 1414287 is on file to do so and remove this hack.
-
-diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp
---- a/clang/lib/Driver/ToolChains/MSVC.cpp
-+++ b/clang/lib/Driver/ToolChains/MSVC.cpp
-@@ -817,8 +816,7 @@
-   switch (Type) {
-   case SubDirectoryType::Bin:
-     if (VSLayout == ToolsetLayout::VS2017OrNewer) {
--      const bool HostIsX64 =
--          llvm::Triple(llvm::sys::getProcessTriple()).isArch64Bit();
-+      const bool HostIsX64 = true;
-       const char *const HostName = HostIsX64 ? "HostX64" : "HostX86";
-       llvm::sys::path::append(Path, "bin", HostName, SubdirName);
-     } else { // OlderVS or DevDivInternal
--- a/taskcluster/ci/toolchain/windows.yml
+++ b/taskcluster/ci/toolchain/windows.yml
@@ -18,37 +18,16 @@ win64-clang-cl:
         using: toolchain-script
         script: build-clang64-windows.sh
         resources:
             - 'build/build-clang/build-clang.py'
             - 'build/build-clang/clang-win64.json'
             - 'taskcluster/scripts/misc/build-clang-windows-helper64.sh'
         toolchain-artifact: public/build/clang.tar.bz2
 
-win32-clang-cl-st-an:
-    description: "Clang-cl static analysis toolchain build"
-    treeherder:
-        kind: build
-        platform: toolchains/opt
-        symbol: TW32(clang-cl-st-an)
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
-    run:
-        using: toolchain-script
-        script: build-clang32-st-an-windows.sh
-        resources:
-            - 'build/build-clang/build-clang.py'
-            - 'build/build-clang/clang-win32-st-an.json'
-            - 'taskcluster/scripts/misc/build-clang-windows-helper32.sh'
-        toolchain-artifact: public/build/clang.tar.bz2
-
 win64-clang-cl-st-an:
     description: "Clang-cl static analysis toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TW64(clang-cl-st-an)
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
deleted file mode 100755
--- a/taskcluster/scripts/misc/build-clang32-st-an-windows.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-source build/src/taskcluster/scripts/misc/build-clang-windows-helper32.sh clang-win32-st-an.json