Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1745115 - Refactor clang configs. r=firefox-build-system-reviewers,andi

Browse Source 
We separate the patchset from the per-platform configuration, which
will ensure we keep the same patchset across them (spoiler alert: we
weren't).
Also, as most builds are PGO, use that in per-platform configurations,
and add an override config that sets it back to 2-stages for the
builds we don't want to PGO.

Differential Revision: https://phabricator.services.mozilla.com/D133317
This commit is contained in:
Mike Hommey 2021-12-10 00:29:58 +00:00
parent 8c429c53cc
commit e0e86945f5
12 changed files with 84 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build-clang/2stages.json Normal file
View File

@ -0,0 +1,4 @@
{
"stages": "2",
"pgo": false
}

25
build/build-clang/clang-13-macosx64.json
View File

@ -1,25 +0,0 @@
{
"stages": "1",
"build_wasm": true,
"osx_cross_compile": true,
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"ar": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-ar",
"ranlib": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-ranlib",
"libtool": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-libtool",
"ld": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt",
"patches": [
"static-llvm-symbolizer_clang_12.patch",
"compiler-rt-cross-compile.patch",
"revert-llvmorg-13-init-8182-gc2297544c047.patch",
"revert-llvmorg-13-init-4019-ga478b0a199f4.patch",
"revert-llvmorg-12-init-7827-g2a078c307204.patch",
"llvmorg-14-init-2833-gbadcd5858972.patch",
"llvmorg-14-init-6706-g6404f4b5af39.patch",
"llvmorg-14-init-9105-g3c47c5ca13b8.patch",
"llvmorg-14-init-11347-g93a20ecee4b6.patch",
"compiler-rt-13-no-codesign.patch"
]
}

12
build/build-clang/clang-13-win64-2stage.json
View File

@ -1,12 +0,0 @@
{
"stages": "2",
"cc": "cl.exe",
"cxx": "cl.exe",
"ml": "ml64.exe",
"patches": [
"llvmorg-14-init-4465-g22ea0cea595e-v2.patch",
"llvmorg-14-init-6706-g6404f4b5af39.patch",
"unpoison-thread-stacks_clang_10.patch",
"bug47258-extract-symbols-mbcs.patch"
]
}

24
build/build-clang/clang-13-win64.json
View File

@ -1,24 +0,0 @@
{
"stages": "4",
"pgo" : true,
"build_wasm": true,
"cc": "cl.exe",
"cxx": "cl.exe",
"ml": "ml64.exe",
"wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt",
"patches": [
"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-8182-gc2297544c047.patch",
"revert-llvmorg-13-init-4019-ga478b0a199f4.patch",
"revert-llvmorg-12-init-7827-g2a078c307204.patch",
"llvmorg-14-init-2833-gbadcd5858972.patch",
"llvmorg-14-init-6706-g6404f4b5af39.patch",
"llvmorg-14-init-9105-g3c47c5ca13b8.patch",
"llvmorg-14-init-11347-g93a20ecee4b6.patch",
"loosen-msvc-detection.patch",
"win64-no-symlink.patch"
]
}

17
build/build-clang/clang-13-linux64.json → build/build-clang/clang-13.json
View File

@ -1,23 +1,22 @@
{
"stages": "4",
"pgo" : true,
"build_wasm": true,
"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",
"compiler-rt-cross-compile.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",
"bug47258-extract-symbols-mbcs.patch",
"Remove-FlushViewOfFile-when-unmaping-gcda-files.patch",
"loosen-msvc-detection.patch",
"fuzzing_ccov_build_clang_12.patch",
"compiler-rt-13-no-codesign.patch",
"win64-no-symlink.patch",
"revert-llvmorg-13-init-8182-gc2297544c047.patch",
"revert-llvmorg-13-init-4019-ga478b0a199f4.patch",
"revert-llvmorg-12-init-7827-g2a078c307204.patch",
"loosen-msvc-detection.patch",
"fuzzing_ccov_build_clang_12.patch",
"llvmorg-14-init-2833-gbadcd5858972.patch",
"llvmorg-14-init-4465-g22ea0cea595e-v2.patch",
"llvmorg-14-init-6706-g6404f4b5af39.patch",
"llvmorg-14-init-9105-g3c47c5ca13b8.patch",
"llvmorg-14-init-11347-g93a20ecee4b6.patch"

9
build/build-clang/clang-5.0-linux64.json
View File

@ -1,9 +0,0 @@
{
"stages": "2",
"cc": "/usr/bin/gcc",
"cxx": "/usr/bin/g++",
"as": "/usr/bin/gcc",
"patches": [
"profile-g4a10504e1f70c.patch"
]
}

7
build/build-clang/clang-5.0.json Normal file
View File

@ -0,0 +1,7 @@
{
"build_wasm": false,
"wasi-compiler-rt": null,
"patches": [
"profile-g4a10504e1f70c.patch"
]
}

6
build/build-clang/clang-trunk-linux64.json → build/build-clang/clang-trunk.json
View File

@ -1,10 +1,4 @@
{
"stages": "2",
"build_wasm": true,
"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",

9
build/build-clang/linux64.json Normal file
View File

@ -0,0 +1,9 @@
{
"stages": "4",
"pgo" : true,
"build_wasm": true,
"cc": "/usr/bin/gcc",
"cxx": "/usr/bin/g++",
"as": "/usr/bin/gcc",
"wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt"
}

13
build/build-clang/macosx64.json Normal file
View File

@ -0,0 +1,13 @@
{
"stages": "1",
"build_wasm": true,
"osx_cross_compile": true,
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"ar": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-ar",
"ranlib": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-ranlib",
"libtool": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-libtool",
"ld": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt"
}

9
build/build-clang/win64.json Normal file
View File

@ -0,0 +1,9 @@
{
"stages": "4",
"pgo" : true,
"build_wasm": true,
"cc": "cl.exe",
"cxx": "cl.exe",
"ml": "ml64.exe",
"wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt"
}

48
taskcluster/ci/toolchain/clang.yml
View File

@ -18,9 +18,13 @@ linux64-clang-5.0:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-5.0-linux64.json'
- 'build/build-clang/linux64.json'
- 'build/build-clang/clang-5.0.json'
- 'build/build-clang/2stages.json'
resources:
- 'build/build-clang/clang-5.0-linux64.json'
- 'build/build-clang/linux64.json'
- 'build/build-clang/clang-5.0.json'
- 'build/build-clang/2stages.json'
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@ -81,9 +85,13 @@ linux64-clang-trunk:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/clang-trunk-linux64.json'
- 'build/build-clang/linux64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/2stages.json'
resources:
- 'build/build-clang/clang-trunk-linux64.json'
- 'build/build-clang/linux64.json'
- 'build/build-clang/clang-trunk.json'
- 'build/build-clang/2stages.json'
toolchain-artifact: public/build/clang.tar.zst
run-on-projects: []
fetches:
@ -104,9 +112,11 @@ linux64-clang-13:
using: toolchain-script
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-linux64.json'
- 'build/build-clang/linux64.json'
- 'build/build-clang/clang-13.json'
resources:
- 'build/build-clang/clang-13-linux64.json'
- 'build/build-clang/linux64.json'
- 'build/build-clang/clang-13.json'
toolchain-alias: linux64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
@ -231,9 +241,11 @@ macosx64-clang-13:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-13.json'
resources:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-13.json'
toolchain-alias: macosx64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
@ -261,9 +273,11 @@ macosx64-aarch64-clang-13:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-13.json'
resources:
- 'build/build-clang/clang-13-macosx64.json'
- 'build/build-clang/macosx64.json'
- 'build/build-clang/clang-13.json'
toolchain-alias: macosx64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
@ -291,9 +305,11 @@ win64-clang-13:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-win64.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-13.json'
resources:
- 'build/build-clang/clang-13-win64.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-13.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: win64-clang
toolchain-artifact: public/build/clang.tar.zst
@ -317,9 +333,13 @@ win64-clang-13-2stage:
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-13-win64-2stage.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-13.json'
- 'build/build-clang/2stages.json'
resources:
- 'build/build-clang/clang-13-win64-2stage.json'
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-13.json'
- 'build/build-clang/2stages.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: win64-clang-2stage
toolchain-artifact: public/build/clang.tar.zst