Merge branch 'llvm-60'

This commit is contained in:
Alex Crichton 2018-02-12 10:57:11 -08:00
commit 7c11f5c018
2 changed files with 2 additions and 2 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "compiler-rt/compiler-rt-cdylib/compiler-rt"] [submodule "compiler-rt"]
path = compiler-rt path = compiler-rt
url = https://github.com/rust-lang/compiler-rt url = https://github.com/rust-lang/compiler-rt

@ -1 +1 @@
Subproject commit c8a8767c56ad3d3f4eb45c87b95026936fb9aa35 Subproject commit dfd960b5f1a1751b22738fa34fd27b583f4618db