From 17ee61de67322899a73185a6c60973116862739f Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 16 Sep 2021 14:28:56 -0700
Subject: [PATCH] Update LLVM to r416183c1.

Test: ./checkbuild.py && ./run_tests.py
Bug: https://github.com/android/ndk/issues/1540
Bug: https://github.com/android/ndk/issues/1551
Bug: https://github.com/android/ndk/issues/1555
Change-Id: I2d345546457d8c461b603be4ea9e725230f11af9
(cherry picked from commit 2af6bc506fb79d47ac9d2e8190cea74f140e1ba8)
---
 docs/changelogs/Changelog-r23.md | 9 ++++++++-
 ndk/toolchains.py                | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/changelogs/Changelog-r23.md b/docs/changelogs/Changelog-r23.md
index fb612e70..de411231 100644
--- a/docs/changelogs/Changelog-r23.md
+++ b/docs/changelogs/Changelog-r23.md
@@ -30,8 +30,12 @@ For Android Studio issues, follow the docs on the [Android Studio site].
 
 ## r23b
 
-* Update LLVM to clang-r416183c, based on LLVM 12 development.
+* Update LLVM to clang-r416183c1, based on LLVM 12 development.
+  * [Issue 1540]: Fixed compiler crash when using coroutines.
   * [Issue 1544]: Now uses universal binaries for M1 Macs.
+  * [Issue 1551]: Prevent each translation unit from receiving its own copy of
+    emulated thread-local global variables.
+  * [Issue 1555]: Fixed compiler crash for armeabi-v7a.
 * [Issue 1536]: Make optimization flags used with CMake more consistent.
   Historically thumb release builds used `-Oz`, but AGP switched to using
   `RelWithDebInfo` for release builds in the latest release which was not using
@@ -56,8 +60,11 @@ For Android Studio issues, follow the docs on the [Android Studio site].
 
 [CMake Issue 22647]: https://gitlab.kitware.com/cmake/cmake/-/issues/22647
 [Issue 1536]: https://github.com/android/ndk/issues/1536
+[Issue 1540]: https://github.com/android/ndk/issues/1540
 [Issue 1544]: https://github.com/android/ndk/issues/1544
+[Issue 1551]: https://github.com/android/ndk/issues/1551
 [Issue 1553]: https://github.com/android/ndk/issues/1553
+[Issue 1555]: https://github.com/android/ndk/issues/1555
 [Issue 1560]: https://github.com/android/ndk/issues/1560
 [Issue 1573]: https://github.com/android/ndk/issues/1573
 [Issue 1569]: https://github.com/android/ndk/issues/1569
diff --git a/ndk/toolchains.py b/ndk/toolchains.py
index 32b0c507..d5ea1893 100644
--- a/ndk/toolchains.py
+++ b/ndk/toolchains.py
@@ -22,7 +22,7 @@
 import ndk.paths
 
 
-CLANG_VERSION = 'clang-r416183c'
+CLANG_VERSION = 'clang-r416183c1'
 
 
 HOST_TRIPLE_MAP = {