about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2020-12-11 09:26:29 -0500
committerCorey Farwell <coreyf@rwell.org>2020-12-11 09:26:29 -0500
commit26cc060756d0456b17fdc53ac5d34e7f7bdc873d (patch)
tree1f26c5d14d349e6ca32959fa55232d888cf023ba
parent7ee606f5142af7af0edec77abf34a40f5bae19d6 (diff)
Switch back to rust-lang/llvm-project now that the patch has merged
-rw-r--r--.gitmodules4
m---------src/llvm-project0
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 1f850bc3300..984113151de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,8 +36,8 @@
 	url = https://github.com/rust-lang/edition-guide.git
 [submodule "src/llvm-project"]
 	path = src/llvm-project
-	url = https://github.com/frewsxcv/llvm-project.git
-	branch = apple-silicon-sanitizers
+	url = https://github.com/rust-lang/llvm-project.git
+	branch = rustc/11.0-2020-10-12
 [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 dcceb131c59e48e49b4b9af09094d8daed4e6a9
+Subproject d5c516edf7897b377ac39ccc5d7ca52a9512440