about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-06-27 05:36:50 +0000
committerbors <bors@rust-lang.org>2022-06-27 05:36:50 +0000
commitbd2e51a338e36372b200a22f3e0e22189a1063e6 (patch)
tree3a07bb50dbd75332b35ce5ece49009a0ed69c9eb
parent7702ae16a23407cdd909ff9174294563ae1f4ba3 (diff)
parent6e6b3eaa9f5512b4a861fc61c35cce44601a1148 (diff)
downloadrust-bd2e51a338e36372b200a22f3e0e22189a1063e6.tar.gz
rust-bd2e51a338e36372b200a22f3e0e22189a1063e6.zip
Auto merge of #98285 - nikic:update-llvm-5, r=cuviper
Rebase LLVM submodule

This is a rebase of our LLVM fork onto LLVM 14.0.5, which is intended to be the last release of the 14.x series. Additionally:

 * I've dropped three patches that were needed to build on FreeBSD 11, which is no longer necessary after #97944.
 * I've dropped some cherry-picks that were later reverted.
 * I've cherry-picked https://github.com/llvm/llvm-project/commit/caa2a829cdf905a5e8664d96a464d414b2adb42e for https://github.com/rust-lang/rust/issues/96797 (fyi `@Amanieu)`
-rw-r--r--.gitmodules2
m---------src/llvm-project0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 21bce3c7fa0..a524098845a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,7 +34,7 @@
 [submodule "src/llvm-project"]
 	path = src/llvm-project
 	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/14.0-2022-03-22
+	branch = rustc/14.0-2022-06-20
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book
 	url = https://github.com/rust-embedded/book.git
diff --git a/src/llvm-project b/src/llvm-project
-Subproject c9e2e89ed3aa5a3be77143aa0c86906b4138374
+Subproject d1ddc34c4b23468f6d2bf553084834b104e16dd