diff options
| author | bors <bors@rust-lang.org> | 2018-09-01 01:07:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-01 01:07:31 +0000 |
| commit | 06a59da5af0cadf478d8ab9e1725fa367fb19cd2 (patch) | |
| tree | 36f66555aa3453abbfe9b135bb286072bcbca5e9 | |
| parent | 571a624aa92a0f1f1a0276d42262a6d2ad89ba7b (diff) | |
| parent | 6c101422514104dc7dbca13bab7a4e8b3b06f030 (diff) | |
Auto merge of #53611 - alexcrichton:update-llvm, r=nikomatsakis
Update LLVM submodule This commit updates the LLVM submodule to the current trunk of LLVM itself. This brings a few notable improvements for the wasm target: * Support for wasm atomic instructions is greatly improved * Renamed memory wasm intrinsics are fully supported * LLD has fixed a quadratic execution bug with large numbers of relocations in wasm files. The compiler-rt submodule has been updated in tandem as well.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | src/bootstrap/native.rs | 1 | ||||
| m--------- | src/libcompiler_builtins | 0 | ||||
| m--------- | src/llvm | 0 | ||||
| -rw-r--r-- | src/rustllvm/llvm-rebuild-trigger | 2 | ||||
| m--------- | src/tools/lld | 0 |
6 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index b1701e4a654..4a7c8f4b7cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ matrix: - env: > RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb" + RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler" SRC=. DEPLOY_ALT=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 @@ -87,7 +87,7 @@ matrix: # OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7. - env: > RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb" + RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler" SRC=. DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 @@ -101,7 +101,7 @@ matrix: - env: > RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb" + RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler" SRC=. DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index c28b467df50..347c2472c6b 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -145,6 +145,7 @@ impl Step for Llvm { .define("LLVM_INCLUDE_EXAMPLES", "OFF") .define("LLVM_INCLUDE_TESTS", "OFF") .define("LLVM_INCLUDE_DOCS", "OFF") + .define("LLVM_INCLUDE_BENCHMARKS", "OFF") .define("LLVM_ENABLE_ZLIB", "OFF") .define("WITH_POLLY", "OFF") .define("LLVM_ENABLE_TERMINFO", "OFF") diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins -Subproject d549d85b1735dc5066b2973f8549557a813bb9c +Subproject f3a13eb2384c7cbb91b6db5b008377e9710d434 diff --git a/src/llvm b/src/llvm -Subproject e19f07f5a6e5546ab4f6ea951e3c6b8627edeaa +Subproject 2a1cdeadd3ea8e1eba9cc681037b83f07332763 diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger index 7da830e1125..24a384fceb8 100644 --- a/src/rustllvm/llvm-rebuild-trigger +++ b/src/rustllvm/llvm-rebuild-trigger @@ -1,4 +1,4 @@ # If this file is modified, then llvm will be (optionally) cleaned and then rebuilt. # The actual contents of this file do not matter, but to trigger a change on the # build bots then the contents should be changed so git updates the mtime. -2018-08-02 +2018-08-22 diff --git a/src/tools/lld b/src/tools/lld -Subproject 813b3b952c07b6b85732c3fbdf3eb74f61a9fa9 +Subproject 2a9b88b8b419d094fb2185c0ca31c28d31bdca0 |
