about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-17 15:14:18 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-17 17:26:43 -0800
commit02c276175af6caeeb0bc41f7c3c5d3bc79db6359 (patch)
tree4921aa7813e57e9741a0bc11e720d40b5f05a50f
parent25ccf3c0daab3cbd2e49f13c89f35ed9f382dc5c (diff)
parent543e148b0f643a2f145b15f6065ee712e36d73c2 (diff)
downloadrust-02c276175af6caeeb0bc41f7c3c5d3bc79db6359.tar.gz
rust-02c276175af6caeeb0bc41f7c3c5d3bc79db6359.zip
rollup merge of #22332: dotdash/llvmup_20150213
Fixes the crash blocking #21886.
m---------src/llvm0
-rw-r--r--src/rustllvm/llvm-auto-clean-trigger2
2 files changed, 1 insertions, 1 deletions
diff --git a/src/llvm b/src/llvm
-Subproject 4891e6382e3e8aa89d530aa18427836428c4715
+Subproject 2089cab13e7f92b487ba0dc1df9f6c05116b004
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index 6bb6f1ad2c7..13173437124 100644
--- a/src/rustllvm/llvm-auto-clean-trigger
+++ b/src/rustllvm/llvm-auto-clean-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly 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.
-2015-02-12
+2015-02-13