From 6c101422514104dc7dbca13bab7a4e8b3b06f030 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 22 Aug 2018 11:17:36 -0700 Subject: [PATCH] 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. --- .travis.yml | 6 +++--- src/bootstrap/native.rs | 1 + src/libcompiler_builtins | 2 +- src/llvm | 2 +- src/rustllvm/llvm-rebuild-trigger | 2 +- src/tools/lld | 2 +- 6 files changed, 8 insertions(+), 7 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 @@ fn run(self, builder: &Builder) -> PathBuf { .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 index d549d85b173..f3a13eb2384 160000 --- a/src/libcompiler_builtins +++ b/src/libcompiler_builtins @@ -1 +1 @@ -Subproject commit d549d85b1735dc5066b2973f8549557a813bb9c8 +Subproject commit f3a13eb2384c7cbb91b6db5b008377e9710d434c diff --git a/src/llvm b/src/llvm index e19f07f5a6e..2a1cdeadd3e 160000 --- a/src/llvm +++ b/src/llvm @@ -1 +1 @@ -Subproject commit e19f07f5a6e5546ab4f6ea951e3c6b8627edeaa7 +Subproject commit 2a1cdeadd3ea8e1eba9cc681037b83f07332763b 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 index 813b3b952c0..2a9b88b8b41 160000 --- a/src/tools/lld +++ b/src/tools/lld @@ -1 +1 @@ -Subproject commit 813b3b952c07b6b85732c3fbdf3eb74f61a9fa96 +Subproject commit 2a9b88b8b419d094fb2185c0ca31c28d31bdca00 -- 2.44.0