зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to autoland. a=merge CLOSED TREE
This commit is contained in:
Noemi Erli
Коммит
abc5a1f51d
|
|
@ -64,10 +64,10 @@ def pgo_profile_path(path, pgo_use, profdata, build_env):
|
|||
|
||||
set_config('PGO_PROFILE_PATH', pgo_profile_path)
|
||||
|
||||
@depends(c_compiler, pgo_profile_path, target_is_windows)
|
||||
@depends(c_compiler, pgo_profile_path)
|
||||
@imports('multiprocessing')
|
||||
@imports(_from='__builtin__', _import='min')
|
||||
def pgo_flags(compiler, profdata, target_is_windows):
|
||||
def pgo_flags(compiler, profdata):
|
||||
if compiler.type == 'gcc':
|
||||
return namespace(
|
||||
gen_cflags=['-fprofile-generate'],
|
||||
|
|
@ -85,15 +85,8 @@ def pgo_flags(compiler, profdata, target_is_windows):
|
|||
else:
|
||||
gen_ldflags = ['-fprofile-generate']
|
||||
|
||||
gen_cflags = [prefix + '-fprofile-generate']
|
||||
if target_is_windows:
|
||||
# native llvm-profdata.exe on Windows can't read profile data
|
||||
# if name compression is enabled (which cross-compiling enables
|
||||
# by default)
|
||||
gen_cflags += ['-mllvm', '-enable-name-compression=false']
|
||||
|
||||
return namespace(
|
||||
gen_cflags=gen_cflags,
|
||||
gen_cflags=[prefix + '-fprofile-generate'],
|
||||
gen_ldflags=gen_ldflags,
|
||||
use_cflags=[prefix + '-fprofile-use=%s' % profdata,
|
||||
# Some error messages about mismatched profile data
|
||||
|
|
|
|||
|
|
@ -359,43 +359,31 @@ win32-shippable/opt:
|
|||
platform: windows2012-32-shippable/opt
|
||||
symbol: Bpgo(B)
|
||||
tier: 1
|
||||
worker-type: b-linux
|
||||
worker-type: b-win2012
|
||||
worker:
|
||||
docker-image: {in-tree: debian9-amd64-build}
|
||||
max-run-time: 10800
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
secrets: true
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
builds/releng_base_linux_64_builds.py
|
||||
- builds/taskcluster_base_windows.py
|
||||
- builds/taskcluster_base_win32.py
|
||||
- taskcluster_nightly.py
|
||||
extra-config:
|
||||
stage_platform: win32
|
||||
mozconfig_platform: win32
|
||||
env:
|
||||
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
|
||||
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
|
||||
fetches:
|
||||
toolchain:
|
||||
- linux64-binutils
|
||||
- linux64-clang-win-cross
|
||||
- linux64-rust-cross
|
||||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-cbindgen
|
||||
- linux64-dump-syms
|
||||
- linux64-wine
|
||||
- linux64-liblowercase
|
||||
fetch:
|
||||
- nsis-3.01-win
|
||||
- upx-3.95-win
|
||||
- win64-clang-cl
|
||||
- win64-rust
|
||||
- win64-rust-size
|
||||
- win64-cbindgen
|
||||
- win64-nasm
|
||||
- win64-node
|
||||
|
||||
win64-shippable/opt:
|
||||
description: "Win64 Shippable"
|
||||
|
|
@ -413,43 +401,31 @@ win64-shippable/opt:
|
|||
platform: windows2012-64-shippable/opt
|
||||
symbol: Bpgo(B)
|
||||
tier: 1
|
||||
worker-type: b-linux
|
||||
worker-type: b-win2012
|
||||
worker:
|
||||
docker-image: {in-tree: debian9-amd64-build}
|
||||
max-run-time: 10800
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
|
||||
run:
|
||||
actions: [get-secrets, build]
|
||||
options: [append-env-variables-from-configs]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
secrets: true
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
- builds/releng_base_linux_64_builds.py
|
||||
- builds/taskcluster_base_windows.py
|
||||
- builds/taskcluster_base_win64.py
|
||||
- taskcluster_nightly.py
|
||||
extra-config:
|
||||
stage_platform: win64
|
||||
mozconfig_platform: win64
|
||||
env:
|
||||
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
|
||||
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
|
||||
fetches:
|
||||
toolchain:
|
||||
- linux64-binutils
|
||||
- linux64-clang-win-cross
|
||||
- linux64-rust-cross
|
||||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-cbindgen
|
||||
- linux64-dump-syms
|
||||
- linux64-wine
|
||||
- linux64-liblowercase
|
||||
fetch:
|
||||
- nsis-3.01-win
|
||||
- upx-3.95-win
|
||||
- win64-clang-cl
|
||||
- win64-rust
|
||||
- win64-rust-size
|
||||
- win64-cbindgen
|
||||
- win64-nasm
|
||||
- win64-node
|
||||
|
||||
win32-add-on-devel/opt:
|
||||
description: "Windows32 add-on-devel"
|
||||
|
|
@ -1310,9 +1286,8 @@ win64-aarch64-shippable-no-eme/opt:
|
|||
platform: windows2012-aarch64/opt
|
||||
symbol: Nn
|
||||
tier: 1
|
||||
worker-type: b-linux
|
||||
worker-type: b-win2012
|
||||
worker:
|
||||
docker-image: {in-tree: debian9-amd64-build}
|
||||
max-run-time: 7200
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
|
||||
|
|
@ -1325,30 +1300,21 @@ win64-aarch64-shippable-no-eme/opt:
|
|||
secrets: true
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
- builds/releng_base_linux_64_builds.py
|
||||
- builds/taskcluster_base_windows.py
|
||||
- taskcluster_nightly.py
|
||||
extra-config:
|
||||
stage_platform: win64-aarch64
|
||||
mozconfig_platform: win64-aarch64
|
||||
env:
|
||||
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
|
||||
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
|
||||
run-on-projects: []
|
||||
fetches:
|
||||
toolchain:
|
||||
- linux64-binutils
|
||||
- linux64-clang-win-cross
|
||||
- linux64-rust-cross
|
||||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-cbindgen
|
||||
- linux64-dump-syms
|
||||
- linux64-wine
|
||||
- linux64-liblowercase
|
||||
fetch:
|
||||
- nsis-3.01-win
|
||||
- upx-3.95-win
|
||||
- win64-clang-cl
|
||||
- win64-rust
|
||||
- win64-rust-size
|
||||
- win64-cbindgen
|
||||
- win64-nasm
|
||||
- win64-node
|
||||
|
||||
|
||||
win64-aarch64-devedition/opt:
|
||||
description: "AArch64 Win64 MSVC Devedition (shippable)"
|
||||
|
|
|
|||
|
|
@ -172,9 +172,8 @@ jobs:
|
|||
shipping-product: firefox
|
||||
treeherder:
|
||||
platform: windows2012-32-shippable/opt
|
||||
worker-type: b-linux
|
||||
worker-type: b-win2012
|
||||
worker:
|
||||
docker-image: {in-tree: debian9-amd64-build}
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
|
||||
run:
|
||||
|
|
@ -182,29 +181,20 @@ jobs:
|
|||
mozconfig-variant: profile-generate
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
- builds/releng_base_linux_64_builds.py
|
||||
- builds/taskcluster_base_windows.py
|
||||
- builds/taskcluster_base_win32.py
|
||||
tooltool-downloads: internal
|
||||
extra-config:
|
||||
stage_platform: win32
|
||||
mozconfig_platform: win32
|
||||
env:
|
||||
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
|
||||
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
|
||||
fetches:
|
||||
toolchain:
|
||||
- linux64-binutils
|
||||
- linux64-clang-win-cross
|
||||
- linux64-rust-cross
|
||||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-cbindgen
|
||||
- linux64-dump-syms
|
||||
- linux64-wine
|
||||
- linux64-liblowercase
|
||||
fetch:
|
||||
- nsis-3.01-win
|
||||
- upx-3.95-win
|
||||
- win64-clang-cl
|
||||
- win64-dump-syms
|
||||
- win64-rust
|
||||
- win64-rust-size
|
||||
- win64-cbindgen
|
||||
- win64-nasm
|
||||
- win64-node
|
||||
|
||||
win64-shippable/opt:
|
||||
description: "Win64 Shippable PGO Instrumented"
|
||||
|
|
@ -214,9 +204,8 @@ jobs:
|
|||
shipping-product: firefox
|
||||
treeherder:
|
||||
platform: windows2012-64-shippable/opt
|
||||
worker-type: b-linux
|
||||
worker-type: b-win2012
|
||||
worker:
|
||||
docker-image: {in-tree: debian9-amd64-build}
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
|
||||
run:
|
||||
|
|
@ -224,26 +213,17 @@ jobs:
|
|||
mozconfig-variant: profile-generate
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
- builds/releng_base_linux_64_builds.py
|
||||
- builds/taskcluster_base_windows.py
|
||||
- builds/taskcluster_base_win64.py
|
||||
tooltool-downloads: internal
|
||||
extra-config:
|
||||
stage_platform: win64
|
||||
mozconfig_platform: win64
|
||||
env:
|
||||
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
|
||||
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
|
||||
fetches:
|
||||
toolchain:
|
||||
- linux64-binutils
|
||||
- linux64-clang-win-cross
|
||||
- linux64-rust-cross
|
||||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-cbindgen
|
||||
- linux64-dump-syms
|
||||
- linux64-wine
|
||||
- linux64-liblowercase
|
||||
fetch:
|
||||
- nsis-3.01-win
|
||||
- upx-3.95-win
|
||||
- win64-clang-cl
|
||||
- win64-dump-syms
|
||||
- win64-rust
|
||||
- win64-rust-size
|
||||
- win64-cbindgen
|
||||
- win64-nasm
|
||||
- win64-node
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче