about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-08 17:47:23 +0000
committerbors <bors@rust-lang.org>2015-09-08 17:47:23 +0000
commit192c37537bc6ffaee06e8b4099dd09ae43bcfee7 (patch)
tree7f182ad1e927af14b754b5a6ada186cfb89ca6a4 /src
parent474ad2fc72735a5f12f1b9d92bf32ffc38547e0a (diff)
parent5cb6b3eb531487896b38df019f3f6a9055fbe494 (diff)
downloadrust-192c37537bc6ffaee06e8b4099dd09ae43bcfee7.tar.gz
rust-192c37537bc6ffaee06e8b4099dd09ae43bcfee7.zip
Auto merge of #28173 - alexcrichton:llvm-37, r=brson
This updates the jemalloc and LLVM submodules to the recently released 4.0.0 and 3.7 versions. There's no breakage on the LLVM side of things because we had already been tracking the 3.7 release branch for awhile and no breakage was introduced, and jemalloc apparently is stable enough that nothing broke!
Diffstat (limited to 'src')
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 874dc4ee4cb782056469f003831bcda3e4cdf0d
+Subproject 168f91ce5cbf8933e47f339911f0f46a4871485
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index dc0fbf6bf94..094d485da6a 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-06-30
+2015-09-02