mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-01 06:51:58 +00:00
d69b24805b
This commit imports the LLD project from LLVM to serve as the default linker for the `wasm32-unknown-unknown` target. The `binaryen` submoule is consequently removed along with "binaryen linker" support in rustc. Moving to LLD brings with it a number of benefits for wasm code: * LLD is itself an actual linker, so there's no need to compile all wasm code with LTO any more. As a result builds should be *much* speedier as LTO is no longer forcibly enabled for all builds of the wasm target. * LLD is quickly becoming an "official solution" for linking wasm code together. This, I believe at least, is intended to be the main supported linker for native code and wasm moving forward. Picking up support early on should help ensure that we can help LLD identify bugs and otherwise prove that it works great for all our use cases! * Improvements to the wasm toolchain are currently primarily focused around LLVM and LLD (from what I can tell at least), so it's in general much better to be on this bandwagon for bugfixes and new features. * Historical "hacks" like `wasm-gc` will soon no longer be necessary, LLD will [natively implement][gc] `--gc-sections` (better than `wasm-gc`!) which means a postprocessor is no longer needed to show off Rust's "small wasm binary size". LLD is added in a pretty standard way to rustc right now. A new rustbuild target was defined for building LLD, and this is executed when a compiler's sysroot is being assembled. LLD is compiled against the LLVM that we've got in tree, which means we're currently on the `release_60` branch, but this may get upgraded in the near future! LLD is placed into rustc's sysroot in a `bin` directory. This is similar to where `gcc.exe` can be found on Windows. This directory is automatically added to `PATH` whenever rustc executes the linker, allowing us to define a `WasmLd` linker which implements the interface that `wasm-ld`, LLD's frontend, expects. Like Emscripten the LLD target is currently only enabled for Tier 1 platforms, notably OSX/Windows/Linux, and will need to be installed manually for compiling to wasm on other platforms. LLD is by default turned off in rustbuild, and requires a `config.toml` option to be enabled to turn it on. Finally the unstable `#![wasm_import_memory]` attribute was also removed as LLD has a native option for controlling this. [gc]: https://reviews.llvm.org/D42511
236 lines
9.5 KiB
YAML
236 lines
9.5 KiB
YAML
environment:
|
|
SCCACHE_BUCKET: rust-lang-ci-sccache2
|
|
SCCACHE_REGION: us-west-1
|
|
AWS_ACCESS_KEY_ID: AKIAJAMV3QAMMA6AXHFQ
|
|
AWS_SECRET_ACCESS_KEY:
|
|
secure: 7Y+JiquYedOAgnUU26uL0DPzrxmTtR+qIwG6rNKSuWDffqU3vVZxbGXim9QpTO80
|
|
SCCACHE_DIGEST: f808afabb4a4eb1d7112bcb3fa6be03b61e93412890c88e177c667eb37f46353d7ec294e559b16f9f4b5e894f2185fe7670a0df15fd064889ecbd80f0c34166c
|
|
TOOLSTATE_REPO_ACCESS_TOKEN:
|
|
secure: PTZiSxJMVUZ0VnMR5i13E4OagbXfglj7pcskDQiKufVrDm13mLoI0vDJAEM35+bY
|
|
|
|
# By default schannel checks revocation of certificates unlike some other SSL
|
|
# backends, but we've historically had problems on CI where a revocation
|
|
# server goes down presumably. See #43333 for more info
|
|
CARGO_HTTP_CHECK_REVOKE: false
|
|
|
|
matrix:
|
|
# 32/64 bit MSVC tests
|
|
- MSYS_BITS: 64
|
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
|
|
SCRIPT: python x.py test
|
|
- MSYS_BITS: 32
|
|
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --target=i686-pc-windows-msvc
|
|
SCRIPT: python x.py test --host i686-pc-windows-msvc --target i686-pc-windows-msvc
|
|
|
|
# MSVC aux tests
|
|
- MSYS_BITS: 64
|
|
RUST_CHECK_TARGET: check-aux
|
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
|
|
|
|
# MSVC tools tests
|
|
- MSYS_BITS: 64
|
|
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows
|
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri
|
|
|
|
# 32/64-bit MinGW builds.
|
|
#
|
|
# We are using MinGW with posix threads since LLVM does not compile with
|
|
# the win32 threads version due to missing support for C++'s std::thread.
|
|
#
|
|
# Instead of relying on the MinGW version installed on appveryor we download
|
|
# and install one ourselves so we won't be surprised by changes to appveyor's
|
|
# build image.
|
|
#
|
|
# Finally, note that the downloads below are all in the `rust-lang-ci` S3
|
|
# bucket, but they cleraly didn't originate there! The downloads originally
|
|
# came from the mingw-w64 SourceForge download site. Unfortunately
|
|
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
|
|
- MSYS_BITS: 32
|
|
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
|
|
SCRIPT: python x.py test --exclude src/test/run-pass --exclude src/test/compile-fail
|
|
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
|
|
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
|
|
MINGW_DIR: mingw32
|
|
- MSYS_BITS: 32
|
|
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
|
|
SCRIPT: python x.py test src/test/run-pass src/test/compile-fail
|
|
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
|
|
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
|
|
MINGW_DIR: mingw32
|
|
- MSYS_BITS: 64
|
|
SCRIPT: python x.py test
|
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
|
|
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
|
|
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
|
|
MINGW_DIR: mingw64
|
|
|
|
# 32/64 bit MSVC and GNU deployment
|
|
- RUST_CONFIGURE_ARGS: >
|
|
--build=x86_64-pc-windows-msvc
|
|
--enable-full-tools
|
|
--enable-profiler
|
|
SCRIPT: python x.py dist
|
|
DEPLOY: 1
|
|
- RUST_CONFIGURE_ARGS: >
|
|
--build=i686-pc-windows-msvc
|
|
--target=i586-pc-windows-msvc
|
|
--enable-full-tools
|
|
--enable-profiler
|
|
SCRIPT: python x.py dist
|
|
DEPLOY: 1
|
|
- MSYS_BITS: 32
|
|
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools
|
|
SCRIPT: python x.py dist
|
|
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
|
|
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
|
|
MINGW_DIR: mingw32
|
|
DEPLOY: 1
|
|
- MSYS_BITS: 64
|
|
SCRIPT: python x.py dist
|
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools
|
|
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
|
|
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
|
|
MINGW_DIR: mingw64
|
|
DEPLOY: 1
|
|
|
|
# "alternate" deployment, see .travis.yml for more info
|
|
- MSYS_BITS: 64
|
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
|
|
SCRIPT: python x.py dist
|
|
DEPLOY_ALT: 1
|
|
|
|
matrix:
|
|
fast_finish: true
|
|
|
|
clone_depth: 2
|
|
build: false
|
|
|
|
install:
|
|
# If we need to download a custom MinGW, do so here and set the path
|
|
# appropriately.
|
|
#
|
|
# Note that this *also* means that we're not using what is typically
|
|
# /mingw32/bin/python2.7.exe, which is a "correct" python interpreter where
|
|
# /usr/bin/python2.7.exe is not. To ensure we use the right interpreter we
|
|
# move `C:\Python27` ahead in PATH and then also make sure the `python2.7.exe`
|
|
# file exists in there (which it doesn't by default).
|
|
- if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/%MINGW_ARCHIVE%
|
|
- if defined MINGW_URL 7z x -y %MINGW_ARCHIVE% > nul
|
|
- if defined MINGW_URL set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
|
|
|
|
# Here we do a pretty heinous thing which is to mangle the MinGW installation
|
|
# we just had above. Currently, as of this writing, we're using MinGW-w64
|
|
# builds of gcc, and that's currently at 6.3.0. We use 6.3.0 as it appears to
|
|
# be the first version which contains a fix for #40546, builds randomly
|
|
# failing during LLVM due to ar.exe/ranlib.exe failures.
|
|
#
|
|
# Unfortunately, though, 6.3.0 *also* is the first version of MinGW-w64 builds
|
|
# to contain a regression in gdb (#40184). As a result if we were to use the
|
|
# gdb provided (7.11.1) then we would fail all debuginfo tests.
|
|
#
|
|
# In order to fix spurious failures (pretty high priority) we use 6.3.0. To
|
|
# avoid disabling gdb tests we download an *old* version of gdb, specifically
|
|
# that found inside the 6.2.0 distribution. We then overwrite the 6.3.0 gdb
|
|
# with the 6.2.0 gdb to get tests passing.
|
|
#
|
|
# Note that we don't literally overwrite the gdb.exe binary because it appears
|
|
# to just use gdborig.exe, so that's the binary we deal with instead.
|
|
- if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/2017-04-20-%MSYS_BITS%bit-gdborig.exe
|
|
- if defined MINGW_URL mv 2017-04-20-%MSYS_BITS%bit-gdborig.exe %MINGW_DIR%\bin\gdborig.exe
|
|
|
|
# Otherwise pull in the MinGW installed on appveyor
|
|
- if NOT defined MINGW_URL set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
|
|
|
|
# Prefer the "native" Python as LLVM has trouble building with MSYS sometimes
|
|
- copy C:\Python27\python.exe C:\Python27\python2.7.exe
|
|
- set PATH=C:\Python27;%PATH%
|
|
|
|
# Download and install sccache
|
|
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-pc-windows-msvc
|
|
- mv 2017-05-12-sccache-x86_64-pc-windows-msvc sccache.exe
|
|
- set PATH=%PATH%;%CD%
|
|
|
|
# Download and install ninja
|
|
#
|
|
# Note that this is originally from the github releases patch of Ninja
|
|
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-15-ninja-win.zip
|
|
- 7z x 2017-03-15-ninja-win.zip
|
|
- set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja
|
|
# - set PATH=%PATH%;%CD% -- this already happens above for sccache
|
|
|
|
# Install InnoSetup to get `iscc` used to produce installers
|
|
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-08-22-is.exe
|
|
- 2017-08-22-is.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
|
- set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%
|
|
|
|
# Help debug some handle issues on AppVeyor
|
|
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-15-Handle.zip
|
|
- mkdir handle
|
|
- 7z x -ohandle 2017-05-15-Handle.zip
|
|
- set PATH=%PATH%;%CD%\handle
|
|
- handle.exe -accepteula -help
|
|
|
|
# Attempt to debug sccache failures
|
|
- set SCCACHE_ERROR_LOG=%CD%/sccache.log
|
|
|
|
test_script:
|
|
- if not exist C:\cache\rustsrc\NUL mkdir C:\cache\rustsrc
|
|
- sh src/ci/init_repo.sh . /c/cache/rustsrc
|
|
- set SRC=.
|
|
- set NO_CCACHE=1
|
|
- sh src/ci/run.sh
|
|
|
|
on_failure:
|
|
- cat %CD%\sccache.log || exit 0
|
|
|
|
branches:
|
|
only:
|
|
- auto
|
|
|
|
before_deploy:
|
|
- ps: |
|
|
New-Item -Path deploy -ItemType directory
|
|
Remove-Item -Recurse -Force build\dist\doc
|
|
Get-ChildItem -Path build\dist | Move-Item -Destination deploy
|
|
Get-ChildItem -Path deploy | Foreach-Object {
|
|
Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_
|
|
}
|
|
|
|
deploy:
|
|
- provider: S3
|
|
skip_cleanup: true
|
|
access_key_id: AKIAJVBODR3IA4O72THQ
|
|
secret_access_key:
|
|
secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
|
|
bucket: rust-lang-ci2
|
|
set_public: true
|
|
region: us-west-1
|
|
artifact: /.*/
|
|
folder: rustc-builds
|
|
on:
|
|
branch: auto
|
|
DEPLOY: 1
|
|
max_error_retry: 5
|
|
|
|
# This provider is the same as the one above except that it has a slightly
|
|
# different upload directory and a slightly different trigger
|
|
- provider: S3
|
|
skip_cleanup: true
|
|
access_key_id: AKIAJVBODR3IA4O72THQ
|
|
secret_access_key:
|
|
secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
|
|
bucket: rust-lang-ci2
|
|
set_public: true
|
|
region: us-west-1
|
|
artifact: /.*/
|
|
folder: rustc-builds-alt
|
|
on:
|
|
branch: auto
|
|
DEPLOY_ALT: 1
|
|
max_error_retry: 5
|
|
|
|
# init:
|
|
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
|
# on_finish:
|
|
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|