Backed out changeset 7de44eaecb13 (bug 1731582) as requested by Andi. CLOSED TREE

This commit is contained in:
Butkovits Atila 2021-10-19 20:52:08 +03:00
Родитель 2fbcbac1e7
Коммит c56f15eca0
35 изменённых файлов: 1554 добавлений и 462 удалений

Просмотреть файл

@ -49,6 +49,8 @@
"patches": [
"static-llvm-symbolizer_clang_12.patch",
"find_symbolizer_linux_clang_10.patch",
"revert-ga478b0a199f4.patch"
"revert-llvmorg-12-init-7827-g2a078c307204.patch",
"revert-llvmorg-12-init-16421-gb688c5875d08.patch",
"revert-r362047-and-r362065_clang_12.patch"
]
}

Просмотреть файл

@ -8,6 +8,7 @@
"cc": "/usr/bin/gcc",
"cxx": "/usr/bin/g++",
"as": "/usr/bin/gcc",
"wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt",
"patches": [
"static-llvm-symbolizer_clang_12.patch",
"find_symbolizer_linux_clang_10.patch",

Просмотреть файл

@ -16,7 +16,7 @@
"patches": [
"static-llvm-symbolizer_clang_12.patch",
"compiler-rt-cross-compile.patch",
"revert-llvmorg-13-init-7827-g2a078c307204.patch",
"compiler-rt-13-no-codesign.patch"
"revert-llvmorg-12-init-7827-g2a078c307204.patch",
"compiler-rt-no-codesign.patch"
]
}

Просмотреть файл

@ -13,8 +13,8 @@
"unpoison-thread-stacks_clang_10.patch",
"downgrade-mangling-error_clang_12.patch",
"bug47258-extract-symbols-mbcs.patch",
"Remove-FlushViewOfFile-when-unmaping-gcda-files.patch",
"revert-llvmorg-13-init-7827-g2a078c307204.patch",
"loosen-msvc-detection.patch"
"revert-llvmorg-12-init-7827-g2a078c307204.patch",
"loosen-msvc-detection.patch",
"Remove-FlushViewOfFile-when-unmaping-gcda-files.patch"
]
}

Просмотреть файл

@ -1,23 +0,0 @@
{
"stages": "4",
"pgo" : true,
"build_libcxx": true,
"build_wasm": true,
"build_type": "Release",
"assertions": false,
"cc": "/usr/bin/gcc",
"cxx": "/usr/bin/g++",
"as": "/usr/bin/gcc",
"wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt",
"patches": [
"static-llvm-symbolizer_clang_12.patch",
"find_symbolizer_linux_clang_10.patch",
"android-mangling-error_clang_12.patch",
"unpoison-thread-stacks_clang_10.patch",
"downgrade-mangling-error_clang_12.patch",
"revert-llvmorg-13-init-7827-g2a078c307204.patch",
"loosen-msvc-detection.patch",
"fuzzing_ccov_build_clang_12.patch",
"revert-ga478b0a199f4.patch"
]
}

Просмотреть файл

@ -1,20 +1,20 @@
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 73d66b980a5e..3b18de2176ba 100644
index d6913dfd3c07..d031a163fdd7 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -432,6 +432,7 @@ ClangTidyASTConsumerFactory::CreateASTConsumer(
for (auto &Check : Checks) {
@@ -418,6 +418,7 @@ ClangTidyASTConsumerFactory::CreateASTConsumer(
if (!Check->isLanguageVersionSupported(Context.getLangOpts()))
continue;
Check->registerMatchers(&*Finder);
+ Check->registerPPCallbacks(Compiler);
Check->registerPPCallbacks(*SM, PP, ModuleExpanderPP);
}
diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.h b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
index 20e9b8e47e6f..aded1f2e196c 100644
index 54b725126752..200780e86804 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyCheck.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
@@ -70,6 +70,9 @@ public:
@@ -130,6 +130,9 @@ public:
return true;
}

Просмотреть файл

@ -15,6 +15,6 @@
"patches": [
"clang-tidy-ci.patch",
"compiler-rt-cross-compile.patch",
"compiler-rt-13-no-codesign.patch"
"compiler-rt-no-codesign.patch"
]
}

Просмотреть файл

@ -1,19 +0,0 @@
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index bc69ec95c419..9f100fdcec2f 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type)
set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
endif()
- if(APPLE)
- # Ad-hoc sign the dylibs
- add_custom_command(TARGET ${libname}
- POST_BUILD
- COMMAND codesign --sign - $<TARGET_FILE:${libname}>
- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR}
- )
- endif()
endif()
set(parent_target_arg)

Просмотреть файл

@ -1,123 +0,0 @@
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index c9360fc67165..b9451bde3dd8 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -310,12 +310,6 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
addPathIfExists(D, SysRoot + "/usr/lib", Paths);
}
-ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const {
- if (getTriple().isAndroid())
- return ToolChain::RLT_CompilerRT;
- return Generic_ELF::GetDefaultRuntimeLibType();
-}
-
ToolChain::CXXStdlibType Linux::GetDefaultCXXStdlibType() const {
if (getTriple().isAndroid())
return ToolChain::CST_Libcxx;
diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
index 169a37c44072..65897631715a 100644
--- a/clang/lib/Driver/ToolChains/Linux.h
+++ b/clang/lib/Driver/ToolChains/Linux.h
@@ -39,7 +39,6 @@ public:
llvm::opt::ArgStringList &CC1Args) const override;
void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const override;
- RuntimeLibType GetDefaultRuntimeLibType() const override;
CXXStdlibType GetDefaultCXXStdlibType() const override;
bool
IsAArch64OutlineAtomicsDefault(const llvm::opt::ArgList &Args) const override;
diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
index cc505588331b..fc43acd07644 100644
--- a/clang/test/Driver/linux-ld.c
+++ b/clang/test/Driver/linux-ld.c
@@ -283,7 +283,7 @@
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-CLANG-ANDROID-NONE %s
// CHECK-CLANG-ANDROID-NONE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
-// CHECK-CLANG-ANDROID-NONE: "-l:libunwind.a" "-ldl" "-lc"
+// CHECK-CLANG-ANDROID-NONE: "-lgcc" "-ldl" "-lc"
//
// RUN: %clang -shared -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=aarch64-linux-android -rtlib=platform --unwindlib=platform \
@@ -291,7 +291,7 @@
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-CLANG-ANDROID-SHARED %s
// CHECK-CLANG-ANDROID-SHARED: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
-// CHECK-CLANG-ANDROID-SHARED: "-l:libunwind.a" "-ldl" "-lc"
+// CHECK-CLANG-ANDROID-SHARED: "-lgcc" "-ldl" "-lc"
//
// RUN: %clang -static -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=aarch64-linux-android -rtlib=platform --unwindlib=platform \
@@ -299,7 +299,7 @@
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: | FileCheck --check-prefix=CHECK-CLANG-ANDROID-STATIC %s
// CHECK-CLANG-ANDROID-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
-// CHECK-CLANG-ANDROID-STATIC: "--start-group" "{{[^"]*}}{{/|\\\\}}libclang_rt.builtins-aarch64-android.a" "-l:libunwind.a" "-lc" "--end-group"
+// CHECK-CLANG-ANDROID-STATIC: "--start-group" "-lgcc" "-lc" "--end-group"
//
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=x86_64-unknown-linux -rtlib=platform --unwindlib=platform \
@@ -1081,12 +1081,10 @@
// CHECK-ANDROID: "--enable-new-dtags"
// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"
// CHECK-ANDROID: "-L[[SYSROOT]]/usr/lib"
-// CHECK-ANDROID-NOT: "-lgcc_s"
-// CHECK-ANDROID-NOT: "-lgcc"
-// CHECK-ANDROID: "-l:libunwind.a"
+// CHECK-ANDROID-NOT: "gcc_s"
+// CHECK-ANDROID: "-lgcc"
// CHECK-ANDROID: "-ldl"
-// CHECK-ANDROID-NOT: "-lgcc_s"
-// CHECK-ANDROID-NOT: "-lgcc"
+// CHECK-ANDROID-NOT: "gcc_s"
// CHECK-ANDROID: "{{.*}}{{/|\\\\}}crtend_android.o"
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=arm-linux-androideabi -rtlib=platform --unwindlib=platform \
@@ -1139,12 +1137,10 @@
// CHECK-ANDROID-SO-NOT: "-Bsymbolic"
// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtbegin_so.o"
// CHECK-ANDROID-SO: "-L[[SYSROOT]]/usr/lib"
-// CHECK-ANDROID-SO-NOT: "-lgcc_s"
-// CHECK-ANDROID-SO-NOT: "-lgcc"
-// CHECK-ANDROID-SO: "-l:libunwind.a"
+// CHECK-ANDROID-SO-NOT: "gcc_s"
+// CHECK-ANDROID-SO: "-lgcc"
// CHECK-ANDROID-SO: "-ldl"
-// CHECK-ANDROID-SO-NOT: "-lgcc_s"
-// CHECK-ANDROID-SO-NOT: "-lgcc"
+// CHECK-ANDROID-SO-NOT: "gcc_s"
// CHECK-ANDROID-SO: "{{.*}}{{/|\\\\}}crtend_so.o"
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=arm-linux-androideabi -rtlib=platform --unwindlib=platform \
@@ -1195,12 +1191,10 @@
// CHECK-ANDROID-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtbegin_static.o"
// CHECK-ANDROID-STATIC: "-L[[SYSROOT]]/usr/lib"
-// CHECK-ANDROID-STATIC-NOT: "-lgcc_eh"
-// CHECK-ANDROID-STATIC-NOT: "-lgcc"
-// CHECK-ANDROID-STATIC: "-l:libunwind.a"
+// CHECK-ANDROID-STATIC-NOT: "gcc_s"
+// CHECK-ANDROID-STATIC: "-lgcc"
// CHECK-ANDROID-STATIC-NOT: "-ldl"
-// CHECK-ANDROID-STATIC-NOT: "-lgcc_eh"
-// CHECK-ANDROID-STATIC-NOT: "-lgcc"
+// CHECK-ANDROID-STATIC-NOT: "gcc_s"
// CHECK-ANDROID-STATIC: "{{.*}}{{/|\\\\}}crtend_android.o"
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=arm-linux-androideabi -rtlib=platform --unwindlib=platform \
@@ -1253,11 +1247,9 @@
// CHECK-ANDROID-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtbegin_dynamic.o"
// CHECK-ANDROID-PIE: "-L[[SYSROOT]]/usr/lib"
-// CHECK-ANDROID-PIE-NOT: "-lgcc_s"
-// CHECK-ANDROID-PIE-NOT: "-lgcc"
-// CHECK-ANDROID-PIE: "-l:libunwind.a"
-// CHECK-ANDROID-PIE-NOT: "-lgcc_s"
-// CHECK-ANDROID-PIE-NOT: "-lgcc"
+// CHECK-ANDROID-PIE-NOT: "gcc_s"
+// CHECK-ANDROID-PIE: "-lgcc"
+// CHECK-ANDROID-PIE-NOT: "gcc_s"
// CHECK-ANDROID-PIE: "{{.*}}{{/|\\\\}}crtend_android.o"
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: --target=arm-linux-androideabi \

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,12 +0,0 @@
diff --git a/llvm/lib/IR/Attributes.cpp b/llvm/lib/IR/Attributes.cpp
index 368fc87dc801..96c2388d776e 100644
--- a/llvm/lib/IR/Attributes.cpp
+++ b/llvm/lib/IR/Attributes.cpp
@@ -1902,7 +1902,6 @@ AttrBuilder AttributeFuncs::typeIncompatible(Type *Ty) {
.addAttribute(Attribute::ReadNone)
.addAttribute(Attribute::ReadOnly)
.addAttribute(Attribute::SwiftError)
- .addAlignmentAttr(1) // the int here is ignored
.addDereferenceableAttr(1) // the int here is ignored
.addDereferenceableOrNullAttr(1) // the int here is ignored
.addPreallocatedAttr(Ty)

Просмотреть файл

@ -0,0 +1,68 @@
Bisection found that r362047 (and its followup build fix r362065) cause the
build to install the android PGO library into the following location:
stage2/clang/lib/linux/libclang_rt.profile-arm-android.a
rather than the expected:
stage2/clang/lib64/clang/$VERSION/lib/linux/libclang_rt.profile-arm-android.a
For lack of any progress in debugging this, revert those two patches.
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index d2f5d6bf80f0..424f4da01f77 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -59,7 +59,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
cmake_minimum_required(VERSION 3.13.4)
project(Runtimes C CXX ASM)
- find_package(LLVM PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_package(Clang PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
# Add the root project's CMake modules, and the LLVM build's modules to the
@@ -67,6 +66,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules"
+ "${LLVM_LIBRARY_DIR}/cmake/llvm"
)
# Some of the runtimes will conditionally use the compiler-rt sanitizers
@@ -81,6 +81,11 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
endif()
endif()
+ # LLVMConfig.cmake contains a bunch of CMake variables from the LLVM build.
+ # This file is installed as part of LLVM distributions, so this can be used
+ # either from a build directory or an installed LLVM.
+ include(LLVMConfig)
+
# Setting these variables will allow the sub-build to put their outputs into
# the library and bin directories of the top-level build.
set(LLVM_LIBRARY_OUTPUT_INTDIR ${LLVM_LIBRARY_DIR})
@@ -90,9 +95,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
set(LLVM_MAIN_SRC_DIR ${LLVM_BUILD_MAIN_SRC_DIR})
set(LLVM_CMAKE_PATH ${LLVM_MAIN_SRC_DIR}/cmake/modules)
- # This variable is used by individual runtimes to locate LLVM files.
- set(LLVM_PATH ${LLVM_BUILD_MAIN_SRC_DIR})
-
if(APPLE)
set(LLVM_ENABLE_LIBCXX ON CACHE BOOL "")
endif()
@@ -421,6 +423,8 @@ ${error} Set RUNTIMES_BUILD_ALLOW_DARWIN to allow a single darwin triple.")
# Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
+ -DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
+ -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
-DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_TRIPLE}
-DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default}
@@ -527,6 +531,8 @@ ${error} Set RUNTIMES_BUILD_ALLOW_DARWIN to allow a single darwin triple.")
# Builtins were built separately above
CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
-DLLVM_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
+ -DLLVM_BINARY_DIR=${LLVM_BINARY_DIR}
+ -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
-DLLVM_DEFAULT_TARGET_TRIPLE=${target}
-DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON

Просмотреть файл

@ -40,9 +40,4 @@ fi
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
if [ -d "$MOZ_FETCHES_DIR/binutils/bin" ]; then
mk_add_options "export PATH=$MOZ_FETCHES_DIR/binutils/bin:$PATH"
export LDFLAGS="$LDFLAGS -B $MOZ_FETCHES_DIR/binutils/bin"
fi
JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh"

Просмотреть файл

@ -302,7 +302,6 @@ extern "C" const char* __tsan_default_suppressions() {
"race:js::wasm::Code::bestTier\n"
"race:js::wasm::Code::commitTier2\n"
"race:js::wasm::Code::setTier2\n"
"race:js::wasm::Code::setAndBorrowTier2\n"
// End of suppressions.
; // Please keep this semicolon.

Просмотреть файл

@ -380,13 +380,6 @@ clang-12:
repo: https://github.com/llvm/llvm-project
revision: fed41342a82f5a3a9201819a82bf7a48313e296b
clang-13:
description: clang 13.0.0 source code
fetch:
type: git
repo: https://github.com/llvm/llvm-project
revision: d7b669b3a30345cfcdb2fde2af6f48aa4b94845d
clang-trunk:
description: clang main branch source code
attributes:

Просмотреть файл

@ -169,8 +169,6 @@ jobs:
- android-gradle-dependencies
- android-ndk-linux
- android-sdk-linux
# Workaround issues in binutils from the ndk with the compiler-rt from clang-13
- linux64-binutils
- linux64-clang-android-cross
- linux64-rust-android
- linux64-rust-size

Просмотреть файл

@ -430,9 +430,7 @@ sm-fuzzing-linux64/opt:
spidermonkey-variant: fuzzing
fetches:
toolchain:
# Keep this with clang-12 until we move to rust 1.56 that uses the same
# LLVM-13 backend as clang-13
- linux64-clang-12
- linux64-clang
- linux64-rust
- linux64-cbindgen
- linux64-dump_syms

Просмотреть файл

@ -28,7 +28,7 @@ linux64-cbindgen:
arguments: ['x86_64-unknown-linux-gnu']
fetches:
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-rust-1.47
- sysroot-x86_64-linux-gnu
@ -39,8 +39,8 @@ macosx64-cbindgen:
arguments: ['x86_64-apple-darwin']
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- linux64-rust-macos-1.47
- macosx64-sdk-11.0
@ -51,8 +51,8 @@ macosx64-aarch64-cbindgen:
arguments: ['aarch64-apple-darwin']
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- linux64-rust-macos-1.49
- macosx64-sdk-11.0

Просмотреть файл

@ -13,15 +13,15 @@ job-defaults:
- libtapi
- ldid
linux64-cctools-port-clang-13:
linux64-cctools-port-clang-12:
treeherder:
symbol: TL(cctools-clang-13)
symbol: TL(cctools-clang-12)
run:
script: build-cctools-port.sh
toolchain-alias: linux64-cctools-port
toolchain-artifact: public/build/cctools.tar.zst
fetches:
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-binutils
- linux64-toolchain-sysroot

Просмотреть файл

@ -23,7 +23,7 @@ job-defaults:
- 'build/build-clang/build-clang.py'
fetches:
fetch:
- clang-13
- clang-12
linux64-clang-tidy:
index:
@ -40,7 +40,7 @@ linux64-clang-tidy:
- trunk
fetches:
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-toolchain-sysroot
macosx64-clang-tidy:
@ -59,8 +59,8 @@ macosx64-clang-tidy:
- trunk
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13-macosx-cross
- linux64-cctools-port-clang-12
- linux64-clang-12-macosx-cross
- macosx64-sdk-11.0
macosx64-arch64-clang-tidy:
@ -82,8 +82,8 @@ macosx64-arch64-clang-tidy:
- trunk
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13-macosx-cross
- linux64-cctools-port-clang-12
- linux64-clang-12-macosx-cross
- macosx64-sdk-11.0
win64-clang-tidy:
@ -136,5 +136,5 @@ linux64-clang-tidy-external:
fetch:
- civet-source
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-toolchain-sysroot

Просмотреть файл

@ -46,8 +46,8 @@ linux64-clang-7:
toolchain:
- linux64-toolchain-sysroot
linux64-clang-13-mingw-x86:
description: "MinGW-Clang 13 x86 toolchain build"
linux64-clang-12-mingw-x86:
description: "MinGW-Clang 12 x86 toolchain build"
treeherder:
symbol: TMW(clang-x86)
worker-type: b-linux
@ -59,16 +59,16 @@ linux64-clang-13-mingw-x86:
toolchain-artifact: public/build/clangmingw.tar.zst
fetches:
fetch:
- clang-13
- clang-12
- mingw-w64
- libunwind
- llvm-mingw
- gcc-9.3.0
toolchain:
- linux64-clang-13
- linux64-clang-12
linux64-clang-13-mingw-x64:
description: "MinGW-Clang 13 x64 toolchain build"
linux64-clang-12-mingw-x64:
description: "MinGW-Clang 12 x64 toolchain build"
treeherder:
symbol: TMW(clang-x64)
tier: 1
@ -81,13 +81,13 @@ linux64-clang-13-mingw-x64:
toolchain-artifact: public/build/clangmingw.tar.zst
fetches:
fetch:
- clang-13
- clang-12
- mingw-w64
- libunwind
- llvm-mingw
- gcc-9.3.0
toolchain:
- linux64-clang-13
- linux64-clang-12
linux64-clang-10:
description: "Clang 10 toolchain build"
@ -144,40 +144,19 @@ linux64-clang-12:
- 'build/build-clang/clang-12-linux64.json'
resources:
- 'build/build-clang/clang-12-linux64.json'
toolchain-alias: linux64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
- clang-12
toolchain:
- linux64-toolchain-sysroot
- wasm32-wasi-compiler-rt-12
linux64-clang-13:
description: "Clang 13 toolchain build"
attributes:
local-toolchain: true
linux64-clang-12-android-cross:
description: "Clang 12 toolchain build"
treeherder:
symbol: TL(clang13)
run-on-projects: [trunk]
run:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-linux64.json'
resources:
- 'build/build-clang/clang-13-linux64.json'
toolchain-alias: linux64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
- clang-13
toolchain:
- linux64-toolchain-sysroot
- wasm32-wasi-compiler-rt-13
linux64-clang-13-android-cross:
description: "Clang 13 toolchain build"
treeherder:
symbol: TL(clang13-android)
symbol: TL(clang12-android)
run:
using: toolchain-script
script: repack-clang-linux-cross.sh
@ -189,30 +168,30 @@ linux64-clang-13-android-cross:
toolchain-alias: linux64-clang-android-cross
toolchain-artifact: public/build/clang.tar.zst
dependencies:
android-aarch64-compiler-rt-13: toolchain-android-aarch64-compiler-rt-13
android-arm-compiler-rt-13: toolchain-android-arm-compiler-rt-13
android-x86-compiler-rt-13: toolchain-android-x86-compiler-rt-13
android-x64-compiler-rt-13: toolchain-android-x64-compiler-rt-13
android-aarch64-compiler-rt-12: toolchain-android-aarch64-compiler-rt-12
android-arm-compiler-rt-12: toolchain-android-arm-compiler-rt-12
android-x86-compiler-rt-12: toolchain-android-x86-compiler-rt-12
android-x64-compiler-rt-12: toolchain-android-x64-compiler-rt-12
fetches:
toolchain:
- linux64-clang-13
android-aarch64-compiler-rt-13:
- linux64-clang-12
android-aarch64-compiler-rt-12:
- artifact: compiler-rt.tar.zst
dest: aarch64
android-arm-compiler-rt-13:
android-arm-compiler-rt-12:
- artifact: compiler-rt.tar.zst
dest: arm
android-x86-compiler-rt-13:
android-x86-compiler-rt-12:
- artifact: compiler-rt.tar.zst
dest: x86
android-x64-compiler-rt-13:
android-x64-compiler-rt-12:
- artifact: compiler-rt.tar.zst
dest: x64
linux64-clang-13-aarch64-cross:
description: "Clang 13 toolchain build with aarch64 runtime"
linux64-clang-12-aarch64-cross:
description: "Clang 12 toolchain build with aarch64 runtime"
treeherder:
symbol: TL(clang13-aarch64)
symbol: TL(clang12-aarch64)
worker-type: b-linux
worker:
max-run-time: 600
@ -221,17 +200,17 @@ linux64-clang-13-aarch64-cross:
toolchain-alias: linux64-clang-aarch64-cross
toolchain-artifact: public/build/clang.tar.zst
dependencies:
linux64-aarch64-compiler-rt-13: toolchain-linux64-aarch64-compiler-rt-13
linux64-aarch64-compiler-rt-12: toolchain-linux64-aarch64-compiler-rt-12
fetches:
toolchain:
- linux64-clang-13
linux64-aarch64-compiler-rt-13:
- linux64-clang-12
linux64-aarch64-compiler-rt-12:
- artifact: compiler-rt.tar.zst
linux64-clang-13-macosx-cross:
description: "Clang 13 toolchain repack with MacOS Compiler RT libs"
linux64-clang-12-macosx-cross:
description: "Clang 12 toolchain repack with MacOS Compiler RT libs"
treeherder:
symbol: TL(clang13-macosx-cross)
symbol: TL(clang12-macosx-cross)
worker-type: b-linux
worker:
max-run-time: 600
@ -240,23 +219,23 @@ linux64-clang-13-macosx-cross:
toolchain-alias: linux64-clang-macosx-cross
toolchain-artifact: public/build/clang.tar.zst
dependencies:
macosx64-aarch64-compiler-rt-13: toolchain-macosx64-aarch64-compiler-rt-13
macosx64-x64-compiler-rt-13: toolchain-macosx64-x64-compiler-rt-13
macosx64-aarch64-compiler-rt-12: toolchain-macosx64-aarch64-compiler-rt-12
macosx64-x64-compiler-rt-12: toolchain-macosx64-x64-compiler-rt-12
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
macosx64-aarch64-compiler-rt-13:
- linux64-cctools-port-clang-12
- linux64-clang-12
macosx64-aarch64-compiler-rt-12:
- artifact: compiler-rt.tar.zst
dest: aarch64
macosx64-x64-compiler-rt-13:
macosx64-x64-compiler-rt-12:
- artifact: compiler-rt.tar.zst
dest: x86_64
linux64-clang-13-win-cross:
description: "Clang 13 toolchain repack with Windows Compiler RT libs"
linux64-clang-12-win-cross:
description: "Clang 12 toolchain repack with Windows Compiler RT libs"
treeherder:
symbol: TL(clang13-win-cross)
symbol: TL(clang12-win-cross)
worker-type: b-linux
worker:
max-run-time: 600
@ -265,22 +244,22 @@ linux64-clang-13-win-cross:
toolchain-alias: linux64-clang-win-cross
toolchain-artifact: public/build/clang.tar.zst
dependencies:
win64-clang-13-2stage: toolchain-win64-clang-13-2stage
win64-clang-12-2stage: toolchain-win64-clang-12-2stage
fetches:
toolchain:
- linux64-clang-13
win64-clang-13-2stage:
- linux64-clang-12
win64-clang-12-2stage:
# Put this into a new directory so it doesn't conflict with the linux toolchain
- artifact: clang.tar.zst
dest: clang-cl
extract: false
macosx64-clang-13:
description: "Clang 13 toolchain build"
macosx64-clang-12:
description: "Clang 12 toolchain build"
attributes:
local-toolchain: true
treeherder:
symbol: TM(clang-13)
symbol: TM(clang-12)
worker-type: b-linux-large
worker:
max-run-time: 3600
@ -289,26 +268,26 @@ macosx64-clang-13:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/clang-12-macosx64.json'
resources:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/clang-12-macosx64.json'
toolchain-alias: macosx64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13-macosx-cross
- linux64-cctools-port-clang-12
- linux64-clang-12-macosx-cross
- macosx64-sdk-11.0
- wasm32-wasi-compiler-rt-13
- wasm32-wasi-compiler-rt-12
macosx64-aarch64-clang-13:
description: "Clang 13 toolchain build"
macosx64-aarch64-clang-12:
description: "Clang 12 toolchain build"
attributes:
local-toolchain: true
treeherder:
symbol: TM(clang-13-aarch64)
symbol: TM(clang-12-aarch64)
worker-type: b-linux-large
worker:
env:
@ -319,26 +298,26 @@ macosx64-aarch64-clang-13:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/clang-12-macosx64.json'
resources:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/clang-12-macosx64.json'
toolchain-alias: macosx64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13-macosx-cross
- linux64-cctools-port-clang-12
- linux64-clang-12-macosx-cross
- macosx64-sdk-11.0
- wasm32-wasi-compiler-rt-13
- wasm32-wasi-compiler-rt-12
win64-clang-13:
description: "Clang-cl 13 toolchain build"
win64-clang-12:
description: "Clang-cl 12 toolchain build"
attributes:
local-toolchain: true
treeherder:
symbol: TW64(clang-13)
symbol: TW64(clang-12)
worker-type: b-win2012
worker:
env:
@ -349,25 +328,25 @@ win64-clang-13:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-win64.json'
- 'build/build-clang/clang-12-win64.json'
resources:
- 'build/build-clang/clang-13-win64.json'
- 'build/build-clang/clang-12-win64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: win64-clang
toolchain-artifact: public/build/clang.tar.zst
tooltool-downloads: internal
fetches:
fetch:
- clang-13
- clang-12
- cmake
- ninja
toolchain:
- wasm32-wasi-compiler-rt-13
- wasm32-wasi-compiler-rt-12
win64-clang-13-2stage:
description: "Clang-cl 13 toolchain 2-stage quick build"
win64-clang-12-2stage:
description: "Clang-cl 12 toolchain 2-stage quick build"
treeherder:
symbol: TW64(clang-13-2stage)
symbol: TW64(clang-12-2stage)
worker-type: b-win2012
worker:
env:
@ -375,15 +354,15 @@ win64-clang-13-2stage:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-win64-2stage.json'
- 'build/build-clang/clang-12-win64-2stage.json'
resources:
- 'build/build-clang/clang-13-win64-2stage.json'
- 'build/build-clang/clang-12-win64-2stage.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: win64-clang-2stage
toolchain-artifact: public/build/clang.tar.zst
tooltool-downloads: internal
fetches:
fetch:
- clang-13
- clang-12
- cmake
- ninja

Просмотреть файл

@ -11,10 +11,10 @@ job-defaults:
script: build-compiler-rt.sh
toolchain-artifact: public/build/compiler-rt.tar.zst
android-aarch64-compiler-rt-13:
description: "android aarch64 Compiler-rt for Clang 13 toolchain build"
android-aarch64-compiler-rt-12:
description: "android aarch64 Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TA(aarch64-crt-13)
symbol: TA(aarch64-crt-12)
run:
arguments:
- aarch64-linux-android
@ -23,15 +23,15 @@ android-aarch64-compiler-rt-13:
- 'build/build-clang/find_symbolizer_linux_clang_10.patch'
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-android-ndk-linux-repack
android-arm-compiler-rt-13:
description: "android arm Compiler-rt for Clang 13 toolchain build"
android-arm-compiler-rt-12:
description: "android arm Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TA(arm-crt-13)
symbol: TA(arm-crt-12)
run:
arguments:
- armv7-linux-android
@ -40,15 +40,15 @@ android-arm-compiler-rt-13:
- 'build/build-clang/find_symbolizer_linux_clang_10.patch'
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-android-ndk-linux-repack
android-x86-compiler-rt-13:
description: "android x86 Compiler-rt for Clang 13 toolchain build"
android-x86-compiler-rt-12:
description: "android x86 Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TA(x86-crt-13)
symbol: TA(x86-crt-12)
run:
arguments:
- i686-linux-android
@ -57,15 +57,15 @@ android-x86-compiler-rt-13:
- 'build/build-clang/find_symbolizer_linux_clang_10.patch'
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-android-ndk-linux-repack
android-x64-compiler-rt-13:
description: "android x64 Compiler-rt for Clang 13 toolchain build"
android-x64-compiler-rt-12:
description: "android x64 Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TA(x64-crt-13)
symbol: TA(x64-crt-12)
run:
arguments:
- x86_64-linux-android
@ -74,15 +74,15 @@ android-x64-compiler-rt-13:
- 'build/build-clang/find_symbolizer_linux_clang_10.patch'
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-android-ndk-linux-repack
linux64-aarch64-compiler-rt-13:
description: "Linux aarch64 Compiler-rt for Clang 13 toolchain build"
linux64-aarch64-compiler-rt-12:
description: "Linux aarch64 Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TL(aarch64-crt-13)
symbol: TL(aarch64-crt-12)
run:
arguments:
- aarch64-unknown-linux-gnu
@ -91,53 +91,53 @@ linux64-aarch64-compiler-rt-13:
- 'build/build-clang/find_symbolizer_linux_clang_10.patch'
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-binutils
- linux64-clang-13
- linux64-clang-12
- sysroot-aarch64-linux-gnu
macosx64-x64-compiler-rt-13:
description: "macOS x64 Compiler-rt for Clang 13 toolchain build"
macosx64-x64-compiler-rt-12:
description: "macOS x64 Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TM(x64-crt-13)
symbol: TM(x64-crt-12)
run:
arguments:
- x86_64-apple-darwin
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- macosx64-sdk-11.0
macosx64-aarch64-compiler-rt-13:
description: "macOS aarch64 Compiler-rt for Clang 13 toolchain build"
macosx64-aarch64-compiler-rt-12:
description: "macOS aarch64 Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TM(aarch64-crt-13)
symbol: TM(aarch64-crt-12)
run:
arguments:
- aarch64-apple-darwin
fetches:
fetch:
- clang-13
- clang-12
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- macosx64-sdk-11.0
wasm32-wasi-compiler-rt-13:
description: "wasm32-wasi Compiler-rt for Clang 13 toolchain build"
wasm32-wasi-compiler-rt-12:
description: "wasm32-wasi Compiler-rt for Clang 12 toolchain build"
treeherder:
symbol: TL(wasi-crt-13)
symbol: TL(wasi-crt-12)
worker-type: b-linux-xlarge
run:
script: build-compiler-rt-wasi.sh
toolchain-alias: wasm32-wasi-compiler-rt
fetches:
fetch:
- clang-13
- clang-12
- wasi-sdk
wasm32-wasi-compiler-rt-10:

Просмотреть файл

@ -24,7 +24,7 @@ linux64-dump_syms:
fetches:
toolchain:
- linux64-binutils
- linux64-clang-13
- linux64-clang-12
- linux64-rust-1.55
- sysroot-x86_64-linux-gnu
@ -38,8 +38,8 @@ macosx64-dump_syms:
fetches:
toolchain:
- linux64-rust-macos-1.55
- linux64-clang-13
- linux64-cctools-port-clang-13
- linux64-clang-12
- linux64-cctools-port-clang-12
- macosx64-sdk-11.0
macosx64-aarch64-dump_syms:
@ -52,8 +52,8 @@ macosx64-aarch64-dump_syms:
fetches:
toolchain:
- linux64-rust-macos-1.55
- linux64-clang-13
- linux64-cctools-port-clang-13
- linux64-clang-12
- linux64-cctools-port-clang-12
- macosx64-sdk-11.0
win64-dump_syms:

Просмотреть файл

@ -26,7 +26,7 @@ linux64-fix-stacks:
fetches:
toolchain:
- linux64-binutils
- linux64-clang-13
- linux64-clang-12
- linux64-rust-1.47
- sysroot-x86_64-linux-gnu
@ -38,8 +38,8 @@ macosx64-fix-stacks:
toolchain-artifact: public/build/fix-stacks.tar.zst
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- linux64-rust-macos-1.47
- macosx64-sdk-11.0
@ -51,8 +51,8 @@ macosx64-aarch64-fix-stacks:
toolchain-artifact: public/build/fix-stacks.tar.zst
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- linux64-rust-macos-1.49
- macosx64-sdk-11.0
@ -70,6 +70,6 @@ win32-fix-stacks:
tooltool-downloads: internal
fetches:
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-liblowercase
- linux64-rust-windows-1.47

Просмотреть файл

@ -30,8 +30,8 @@ macosx64-gn:
script: build-gn-macosx.sh
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- macosx64-sdk-11.0
win32-gn:

Просмотреть файл

@ -28,7 +28,7 @@ linux64-minidump-stackwalk:
symbol: TL(stackwalk)
fetches:
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-binutils
- linux64-rust-1.53
- linux64-toolchain-sysroot
@ -40,8 +40,8 @@ macosx64-minidump-stackwalk:
arguments: ['macosx64']
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- linux64-rust-macos-1.53
- macosx64-sdk-11.0
@ -52,8 +52,8 @@ macosx64-aarch64-minidump-stackwalk:
arguments: ['macosx64-aarch64']
fetches:
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13
- linux64-cctools-port-clang-12
- linux64-clang-12
- linux64-rust-macos-1.53
- macosx64-sdk-11.0
@ -76,6 +76,6 @@ linux64-breakpad-injector:
symbol: TL(injector)
fetches:
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-binutils
- linux64-toolchain-sysroot

Просмотреть файл

@ -52,7 +52,7 @@ linux64-hfsplus:
fetch:
- hfsplus-tools
toolchain:
- linux64-clang-13
- linux64-clang-12
linux64-libdmg:
description: "libdmg-hfsplus toolchain build"
@ -65,7 +65,7 @@ linux64-libdmg:
fetch:
- libdmg-hfsplus
toolchain:
- linux64-clang-13
- linux64-clang-12
- linux64-toolchain-sysroot
linux64-mar-tools:
@ -293,5 +293,5 @@ nsis:
- nsis-3.07
- nsis-3.07-win
toolchain:
- linux64-clang-13
- linux64-clang-12
- sysroot-x86_64-linux-gnu

Просмотреть файл

@ -38,8 +38,8 @@ macosx64-nasm:
fetch:
- nasm-2.15.05
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13-macosx-cross
- linux64-cctools-port-clang-12
- linux64-clang-12-macosx-cross
- macosx64-sdk-11.0
macosx64-aarch64-nasm:
@ -55,8 +55,8 @@ macosx64-aarch64-nasm:
fetch:
- nasm-2.14.02
toolchain:
- linux64-cctools-port-clang-13
- linux64-clang-13-macosx-cross
- linux64-cctools-port-clang-12
- linux64-clang-12-macosx-cross
- macosx64-sdk-11.0
linux64-nasm:
@ -72,7 +72,7 @@ linux64-nasm:
fetch:
- nasm-2.15.05
toolchain:
- linux64-clang-13
- linux64-clang-12
- sysroot-x86_64-linux-gnu
linux64-nasm-2.14.02:
@ -86,5 +86,5 @@ linux64-nasm-2.14.02:
fetch:
- nasm-2.14.02
toolchain:
- linux64-clang-13
- linux64-clang-12
- sysroot-x86_64-linux-gnu

Просмотреть файл

@ -27,7 +27,7 @@ linux64-sccache:
fetches:
toolchain:
- linux64-rust-1.47
- linux64-clang-13
- linux64-clang-12
- linux64-binutils
- sysroot-x86_64-linux-gnu
@ -43,8 +43,8 @@ macosx64-sccache:
fetches:
toolchain:
- linux64-rust-macos-1.47
- linux64-clang-13
- linux64-cctools-port-clang-13
- linux64-clang-12
- linux64-cctools-port-clang-12
- macosx64-sdk-11.0
macosx64-aarch64-sccache:
@ -59,8 +59,8 @@ macosx64-aarch64-sccache:
fetches:
toolchain:
- linux64-rust-macos-1.49
- linux64-clang-13
- linux64-cctools-port-clang-13
- linux64-clang-12
- linux64-cctools-port-clang-12
- macosx64-sdk-11.0
win64-sccache:

Просмотреть файл

@ -75,10 +75,10 @@ sysroot-wasm32-wasi:
toolchain-artifact: public/build/sysroot-wasm32-wasi.tar.zst
fetches:
fetch:
- clang-13
- clang-12
- wasi-sdk
toolchain:
- linux64-clang-13
- linux64-clang-12
sysroot-aarch64-linux-gnu:
description: "Sysroot for linux64 aarch64 builds"

Просмотреть файл

@ -107,15 +107,15 @@ jobs:
name: public/build/wrench-macos-headless.tar.bz2
path: /builds/worker/artifacts/wrench-macos-headless.tar.bz2
dependencies:
macosx64-clang-13: toolchain-macosx64-clang-13
macosx64-clang-12: toolchain-macosx64-clang-12
fetches:
toolchain:
- linux64-rust-macos
- linux64-cctools-port
- linux64-clang-13-macosx-cross
- linux64-clang-12-macosx-cross
- macosx64-sdk-10.12
- wrench-deps
macosx64-clang-13:
macosx64-clang-12:
- artifact: clang.tar.zst
dest: clang-mac
run:

Просмотреть файл

@ -149,7 +149,64 @@ build_libcxx() {
# other options.
DEBUG_FLAGS="-g -gcodeview"
# First configure libcxx
mkdir libunwind
pushd libunwind
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$CROSS_PREFIX_DIR \
-DCMAKE_C_COMPILER=$CC \
-DCMAKE_CXX_COMPILER=$CXX \
-DCMAKE_CROSSCOMPILING=TRUE \
-DCMAKE_SYSROOT=$CROSS_PREFIX_DIR \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
-DLLVM_COMPILER_CHECKED=TRUE \
-DCMAKE_AR=$INSTALL_DIR/bin/llvm-ar \
-DCMAKE_RANLIB=$INSTALL_DIR/bin/llvm-ranlib \
-DLLVM_NO_OLD_LIBSTDCXX=TRUE \
-DCXX_SUPPORTS_CXX11=TRUE \
-DCXX_SUPPORTS_CXX_STD=TRUE \
-DLIBUNWIND_USE_COMPILER_RT=TRUE \
-DLIBUNWIND_ENABLE_THREADS=TRUE \
-DLIBUNWIND_ENABLE_SHARED=FALSE \
-DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \
-DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -Wno-dll-attribute-on-redeclaration -nostdinc++ -I$TOOLCHAIN_DIR/libcxx/include -DPSAPI_VERSION=2" \
-DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \
$MOZ_FETCHES_DIR/libunwind
make $make_flags
make $make_flags install
popd
mkdir libcxxabi
pushd libcxxabi
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$CROSS_PREFIX_DIR \
-DCMAKE_C_COMPILER=$CC \
-DCMAKE_CXX_COMPILER=$CXX \
-DCMAKE_CROSSCOMPILING=TRUE \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
-DCMAKE_SYSROOT=$CROSS_PREFIX_DIR \
-DLLVM_COMPILER_CHECKED=TRUE \
-DCMAKE_AR=$INSTALL_DIR/bin/llvm-ar \
-DCMAKE_RANLIB=$INSTALL_DIR/bin/llvm-ranlib \
-DLIBCXXABI_USE_COMPILER_RT=ON \
-DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
-DLIBCXXABI_ENABLE_THREADS=ON \
-DLIBCXXABI_TARGET_TRIPLE=$machine-w64-mingw32 \
-DLIBCXXABI_ENABLE_SHARED=OFF \
-DLIBCXXABI_LIBCXX_INCLUDES=$TOOLCHAIN_DIR/libcxx/include \
-DLLVM_NO_OLD_LIBSTDCXX=TRUE \
-DCXX_SUPPORTS_CXX11=TRUE \
-DCXX_SUPPORTS_CXX_STD=TRUE \
-DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \
$TOOLCHAIN_DIR/libcxxabi
make $make_flags VERBOSE=1
popd
mkdir libcxx
pushd libcxx
cmake \
@ -181,67 +238,6 @@ build_libcxx() {
-DLIBCXX_CXX_ABI_LIBRARY_PATH=../libcxxabi/lib \
-DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \
$TOOLCHAIN_DIR/libcxx
popd
mkdir libunwind
pushd libunwind
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$CROSS_PREFIX_DIR \
-DCMAKE_C_COMPILER=$CC \
-DCMAKE_CXX_COMPILER=$CXX \
-DCMAKE_CROSSCOMPILING=TRUE \
-DCMAKE_SYSROOT=$CROSS_PREFIX_DIR \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
-DLLVM_COMPILER_CHECKED=TRUE \
-DCMAKE_AR=$INSTALL_DIR/bin/llvm-ar \
-DCMAKE_RANLIB=$INSTALL_DIR/bin/llvm-ranlib \
-DLLVM_NO_OLD_LIBSTDCXX=TRUE \
-DCXX_SUPPORTS_CXX11=TRUE \
-DCXX_SUPPORTS_CXX_STD=TRUE \
-DLIBUNWIND_USE_COMPILER_RT=TRUE \
-DLIBUNWIND_ENABLE_THREADS=TRUE \
-DLIBUNWIND_ENABLE_SHARED=FALSE \
-DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \
-DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -Wno-dll-attribute-on-redeclaration -nostdinc++ -I$TOOLCHAIN_DIR/build/libcxx/include/c++/v1 -DPSAPI_VERSION=2" \
-DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \
$MOZ_FETCHES_DIR/libunwind
make $make_flags
make $make_flags install
popd
mkdir libcxxabi
pushd libcxxabi
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$CROSS_PREFIX_DIR \
-DCMAKE_C_COMPILER=$CC \
-DCMAKE_CXX_COMPILER=$CXX \
-DCMAKE_CROSSCOMPILING=TRUE \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
-DCMAKE_SYSROOT=$CROSS_PREFIX_DIR \
-DLLVM_COMPILER_CHECKED=TRUE \
-DCMAKE_AR=$INSTALL_DIR/bin/llvm-ar \
-DCMAKE_RANLIB=$INSTALL_DIR/bin/llvm-ranlib \
-DLIBCXXABI_USE_COMPILER_RT=ON \
-DLIBCXXABI_ENABLE_EXCEPTIONS=ON \
-DLIBCXXABI_ENABLE_THREADS=ON \
-DLIBCXXABI_TARGET_TRIPLE=$machine-w64-mingw32 \
-DLIBCXXABI_ENABLE_SHARED=OFF \
-DLIBCXXABI_LIBCXX_INCLUDES=$TOOLCHAIN_DIR/libcxx/include/ \
-DLLVM_NO_OLD_LIBSTDCXX=TRUE \
-DCXX_SUPPORTS_CXX11=TRUE \
-DCXX_SUPPORTS_CXX_STD=TRUE \
-DCMAKE_CXX_FLAGS="${DEBUG_FLAGS} -I$TOOLCHAIN_DIR/build/libcxx/include/c++/v1 -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \
$TOOLCHAIN_DIR/libcxxabi
make $make_flags VERBOSE=1
popd
pushd libcxx
make $make_flags VERBOSE=1
make $make_flags install

Просмотреть файл

@ -95,7 +95,6 @@ case "$target" in
-DANDROID_NATIVE_API_LEVEL=$api_level
-DSANITIZER_ALLOW_CXXABI=OFF
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-DCOMPILER_RT_BUILD_ORC=OFF
"
;;
aarch64-unknown-linux-gnu)

Просмотреть файл

@ -9,8 +9,7 @@ cd $MOZ_FETCHES_DIR
# We have a non-extracted clang-cl/clang.tar.zst for Windows clang-cl that we need to extract
# files from.
$GECKO_PATH/taskcluster/scripts/misc/zstdpy -d clang-cl/clang.tar.zst | tar -x --wildcards clang/lib/clang/*/lib/windows clang/bin/clang.exe clang/bin/llvm-symbolizer.exe
mv clang/bin/clang.exe clang/bin/clang-cl.exe
$GECKO_PATH/taskcluster/scripts/misc/zstdpy -d clang-cl/clang.tar.zst | tar -x --wildcards clang/lib/clang/*/lib/windows clang/bin/clang-cl.exe clang/bin/llvm-symbolizer.exe
chmod +x clang/bin/clang-cl.exe
tar caf clang.tar.zst clang