diff --git a/RELEASES.md b/RELEASES.md
index a247eb2e9555c..55552e077f6df 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -89,9 +89,6 @@ Libraries
 Misc
 ----
 
-* [The `--error-format=json` flag to `rustc` causes it to emit errors
-  in JSON format][1.7j]. This is an unstable flag and so also requires
-  the `-Z unstable-options` flag.
 * [When running tests with `--test`, rustdoc will pass `--cfg`
   arguments to the compiler][1.7dt].
 * [The compiler is built with RPATH information by default][1.7rpa].
@@ -135,7 +132,6 @@ Compatibility Notes
 [1.7dta]: https://github.com/rust-lang/rust/pull/30394
 [1.7f]: https://github.com/rust-lang/rust/pull/30672
 [1.7h]: https://github.com/rust-lang/rust/pull/30818
-[1.7j]: https://github.com/rust-lang/rust/pull/30711
 [1.7ll]: https://github.com/rust-lang/rust/pull/30663
 [1.7m]: https://github.com/rust-lang/rust/pull/30381
 [1.7p]: https://github.com/rust-lang/rust/pull/30681
diff --git a/src/liblibc b/src/liblibc
index 16f1c190afbc7..a64ee24718c02 160000
--- a/src/liblibc
+++ b/src/liblibc
@@ -1 +1 @@
-Subproject commit 16f1c190afbc7605ed50a40f802189e436de68f6
+Subproject commit a64ee24718c0289b82a77d692cf56f8a1226de51
diff --git a/src/llvm b/src/llvm
index 69ef168544e4f..de5c31045dc0f 160000
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit 69ef168544e4f15b793dd35d272008fde9a6e835
+Subproject commit de5c31045dc0f6da1f65d02ee640ccf99ba90e7c