about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-30 06:17:52 +0000
committerbors <bors@rust-lang.org>2017-06-30 06:17:52 +0000
commit4c5b437176a65c8686865bd7b8f9bb27c239d37c (patch)
tree28f8be958d52397a592dfc59e0ea2c2588d2e2dd
parenta4c68c62f0f9e4187b0daa469335a7b03d02c699 (diff)
parent0e6eecb4e5bd2a9c308617f5e0c3cdf43124a601 (diff)
downloadrust-4c5b437176a65c8686865bd7b8f9bb27c239d37c.tar.gz
rust-4c5b437176a65c8686865bd7b8f9bb27c239d37c.zip
Auto merge of #42930 - arielb1:llvm-next, r=alexcrichton
Rebase LLVM on top of LLVM 4.0.1

Fixes #42893.

Please don't backport this to beta as-is - I'm not sure I want rust-lang/llvm#84 to sneak to beta before it gets sufficient testing.

r? @alexcrichton
m---------src/llvm0
-rw-r--r--src/rustllvm/llvm-rebuild-trigger2
2 files changed, 1 insertions, 1 deletions
diff --git a/src/llvm b/src/llvm
-Subproject d8c9dfcc4f5289c09bab5736966feee2a0e6959
+Subproject 8e1b4fedfa4542e65f82fe124bd6433f3bd0aec
diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger
index e547659d19a..37ba3264452 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.
-2017-06-19
+2017-06-27